meson: Use install_rpath as needed (#200)

This commit is contained in:
Rico Tzschichholz 2018-03-14 08:46:38 +01:00 committed by Cody Garver
parent 6d3253a529
commit ffcde2a31a
8 changed files with 9 additions and 2 deletions

View File

@ -21,6 +21,7 @@ gala_lib = shared_library(
include_directories: config_inc_dir,
install: true,
install_dir: [true, join_paths(get_option('includedir'), 'gala'), true],
install_rpath: mutter_typelib_dir,
version : '0.0.0',
vala_args: [
'--pkg', 'config',

View File

@ -230,9 +230,10 @@ if mutter_dep.length() == 0
error ('No supported mutter library found!')
endif
mutter_typelib_dir = libmutter_dep.get_pkgconfig_variable('typelibdir')
add_project_arguments(vala_flags, language: 'vala')
add_project_link_arguments(['-Wl,-rpath,@0@'.format(libmutter_dep.get_pkgconfig_variable('typelibdir'))], language: 'c')
add_project_link_arguments(['-Wl,-rpath,@0@'.format(mutter_typelib_dir)], language: 'c')
gala_base_dep = [glib_dep, gee_dep, gtk_dep, plank_dep, bamf_dep, mutter_dep, granite_dep, gnome_desktop_dep, m_dep]

View File

@ -10,4 +10,5 @@ gala_maskcorners_lib = shared_library(
include_directories: config_inc_dir,
install: true,
install_dir: plugins_dir,
install_rpath: mutter_typelib_dir,
)

View File

@ -17,6 +17,7 @@ gala_notify_lib = shared_library(
include_directories: config_inc_dir,
install: true,
install_dir: plugins_dir,
install_rpath: mutter_typelib_dir,
)
install_data(

View File

@ -13,4 +13,5 @@ gala_pip_lib = shared_library(
include_directories: config_inc_dir,
install: true,
install_dir: plugins_dir,
install_rpath: mutter_typelib_dir,
)

View File

@ -9,4 +9,5 @@ gala_template_lib = shared_library(
include_directories: config_inc_dir,
install: false,
install_dir: plugins_dir,
install_rpath: mutter_typelib_dir,
)

View File

@ -9,4 +9,5 @@ gala_zoom_lib = shared_library(
include_directories: config_inc_dir,
install: true,
install_dir: plugins_dir,
install_rpath: mutter_typelib_dir,
)

View File

@ -44,6 +44,6 @@ gala_bin = executable(
gala_bin_sources,
dependencies: [gala_dep, gala_base_dep],
include_directories: config_inc_dir,
install_rpath: libmutter_dep.get_pkgconfig_variable('typelibdir'),
install_rpath: mutter_typelib_dir,
install: true,
)