meson: remove rpath options

This commit is contained in:
emersion 2019-01-18 08:26:44 +01:00
parent ab35e0383f
commit bb2f007ad3
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
7 changed files with 6 additions and 24 deletions

View File

@ -126,17 +126,6 @@ else
endif
add_project_arguments('-DSWAY_VERSION=@0@'.format(version), language: 'c')
if get_option('use_rpath')
if get_option('custom_rpath') == ''
# default to platform specific libdir, one level up from the binary
rpathdir = join_paths('$ORIGIN', '..', '$LIB')
else
rpathdir = get_option('custom_rpath')
endif
else
rpathdir = ''
endif
sway_inc = include_directories('include')
subdir('include')

View File

@ -1,6 +1,4 @@
option('sway-version', type : 'string', description: 'The version string reported in `sway --version`.')
option('use_rpath', type: 'boolean', value: false, description: 'install binaries with rpath set')
option('custom_rpath', type: 'string', value: '', description: 'override rpath with a custom one')
option('default-wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.')
option('zsh-completions', type: 'boolean', value: true, description: 'Install zsh shell completions.')
option('bash-completions', type: 'boolean', value: true, description: 'Install bash shell completions.')

View File

@ -205,6 +205,5 @@ executable(
include_directories: [sway_inc],
dependencies: sway_deps,
link_with: [lib_sway_common],
install_rpath : rpathdir,
install: true
)

View File

@ -42,6 +42,5 @@ executable(
include_directories: [sway_inc],
dependencies: swaybar_deps,
link_with: [lib_sway_common, lib_sway_client],
install_rpath : rpathdir,
install: true
)

View File

@ -14,6 +14,5 @@ executable(
wlroots,
],
link_with: [lib_sway_common, lib_sway_client],
install_rpath : rpathdir,
install: true
)

View File

@ -4,6 +4,5 @@ executable(
include_directories: [sway_inc],
dependencies: [jsonc, wlroots],
link_with: [lib_sway_common],
install_rpath : rpathdir,
install: true
)

View File

@ -19,6 +19,5 @@ executable(
wlroots,
],
link_with: [lib_sway_common, lib_sway_client],
install_rpath : rpathdir,
install: true
)