mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-27 15:36:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

meson: remove rpath options

Browse source
This commit is contained in:
emersion 2019-01-18 08:26:44 +01:00
parent ab35e0383f
commit bb2f007ad3
Failed to generate hash of commit
7 changed files with 6 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
meson.build
View file

@ -126,17 +126,6 @@ else
endif endif
add_project_arguments('-DSWAY_VERSION=@0@'.format(version), language: 'c') 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') sway_inc = include_directories('include')
subdir('include') subdir('include')

2
meson_options.txt
View file

@ -1,6 +1,4 @@
option('sway-version', type : 'string', description: 'The version string reported in `sway --version`.') 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('default-wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.')
option('zsh-completions', type: 'boolean', value: true, description: 'Install zsh shell completions.') option('zsh-completions', type: 'boolean', value: true, description: 'Install zsh shell completions.')
option('bash-completions', type: 'boolean', value: true, description: 'Install bash shell completions.') option('bash-completions', type: 'boolean', value: true, description: 'Install bash shell completions.')

1
sway/meson.build
View file

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

1
swaybar/meson.build
View file

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

1
swaybg/meson.build
View file

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

13
swaymsg/meson.build
View file

@ -1,9 +1,8 @@
executable( executable(
'swaymsg', 'swaymsg',
'main.c', 'main.c',
include_directories: [sway_inc], include_directories: [sway_inc],
dependencies: [jsonc, wlroots], dependencies: [jsonc, wlroots],
link_with: [lib_sway_common], link_with: [lib_sway_common],
install_rpath : rpathdir, install: true
install: true
) )

1
swaynag/meson.build
View file

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