Commit 4238417ba05152dfada978a4b7f9f7f7e12acd47
2021-04-26T17:27:01
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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57
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