diff options
| author | Adrian Perez de Castro <aperez@igalia.com> | 2021-04-26 17:27:01 +0300 |
|---|---|---|
| committer | Ran Benita <ran@unusedvar.com> | 2021-04-27 09:54:58 +0300 |
| commit | 4238417ba05152dfada978a4b7f9f7f7e12acd47 (patch) | |
| tree | e4e6ad1a42d36a80aa37136ac09f5eaf5dba0278 | |
| parent | 5cd76a8d934936115caf04f2aea1d713dc43b8e9 (diff) | |
| download | libxkbcommon-4238417ba05152dfada978a4b7f9f7f7e12acd47.tar.gz libxkbcommon-4238417ba05152dfada978a4b7f9f7f7e12acd47.tar.bz2 libxkbcommon-4238417ba05152dfada978a4b7f9f7f7e12acd47.zip | |
Meson: Allow building as subproject
Specify where to find the headers for libxkbcommon_dep,
libxkbcommon_x11_dep, and libxkbregistry_dep, which allows other
projects to correctly locate the headers when libxkbcommon is being
built as a Meson subproject.
The dep_libxkbregistry variable is renamed to libxkbregistry_dep,
to follow the usual convention for variables which hold declared
dependencies to be used from subproject builds.
| -rw-r--r-- | meson.build | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 2986cd3..50f47d1 100644 --- a/meson.build +++ b/meson.build @@ -264,8 +264,11 @@ install_headers( 'xkbcommon/xkbcommon-names.h', subdir: 'xkbcommon', ) + +# This variable may be used to build as a subproject and should not be renamed. libxkbcommon_dep = declare_dependency( link_with: libxkbcommon, + include_directories: include_directories('.'), ) pkgconfig.generate( libxkbcommon, @@ -331,8 +334,10 @@ You can disable X11 support with -Denable-x11=false.''') 'xkbcommon/xkbcommon-x11.h', subdir: 'xkbcommon', ) + # This variable may be used to build as a subproject and should not be renamed. libxkbcommon_x11_dep = declare_dependency( link_with: libxkbcommon_x11, + include_directories: include_directories('.'), ) pkgconfig.generate( libxkbcommon_x11, @@ -394,8 +399,9 @@ if get_option('enable-xkbregistry') description: 'XKB API to query available rules, models, layouts, variants and options', ) - dep_libxkbregistry = declare_dependency( - include_directories: include_directories('xkbcommon'), + # This variable may be used to build as a subproject and should not be renamed. + libxkbregistry_dep = declare_dependency( + include_directories: include_directories('.'), link_with: libxkbregistry ) endif @@ -508,7 +514,7 @@ You can disable the Wayland xkbcli programs with -Denable-wayland=false.''') configh_data.set10('HAVE_XKBCLI_LIST', true) executable('xkbcli-list', 'tools/registry-list.c', - dependencies: dep_libxkbregistry, + dependencies: libxkbregistry_dep, install: true, install_dir: dir_libexec) install_man('tools/xkbcli-list.1') @@ -679,7 +685,7 @@ if get_option('enable-xkbregistry') 'registry', executable('test-registry', 'test/registry.c', include_directories: include_directories('src'), - dependencies: dep_libxkbregistry), + dependencies: libxkbregistry_dep), env: test_env, ) endif |