X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=meson.build;h=2aa74c34cc18fc2ffceaf0cef3764937d8547822;hb=8531ea723fde41062a2cda7a5b75a01716e30a78;hp=a4b0f7b21d8b8e9e63dd2fc45993ccf7783f380b;hpb=608e9361e39fe905f6cb2dc13bfd9a50c1c02310;p=platform%2Fupstream%2Flibxkbcommon.git diff --git a/meson.build b/meson.build index a4b0f7b..2aa74c3 100644 --- a/meson.build +++ b/meson.build @@ -1,9 +1,9 @@ project( 'libxkbcommon', 'c', - version: '0.10.0', + version: '1.3.1', default_options: [ - 'c_std=c99', + 'c_std=c11', 'warning_level=2', 'b_lundef=true', ], @@ -47,6 +47,10 @@ if XKBCONFIGROOT == '' endif endif +XKBCONFIGEXTRAPATH = get_option('xkb-config-extra-path') +if XKBCONFIGEXTRAPATH == '' + XKBCONFIGEXTRAPATH = get_option('prefix')/get_option('sysconfdir')/'xkb' +endif # The X locale directory for compose. XLOCALEDIR = get_option('x-locale-root') @@ -70,6 +74,7 @@ endif configh_data.set(system_extensions, 1) system_ext_define = '#define ' + system_extensions configh_data.set_quoted('DFLT_XKB_CONFIG_ROOT', XKBCONFIGROOT) +configh_data.set_quoted('DFLT_XKB_CONFIG_EXTRA_PATH', XKBCONFIGEXTRAPATH) configh_data.set_quoted('XLOCALEDIR', XLOCALEDIR) configh_data.set_quoted('DEFAULT_XKB_RULES', get_option('default-rules')) configh_data.set_quoted('DEFAULT_XKB_MODEL', get_option('default-model')) @@ -84,6 +89,9 @@ if get_option('default-options') != '' else configh_data.set('DEFAULT_XKB_OPTIONS', 'NULL') endif +if cc.has_header('unistd.h') + configh_data.set('HAVE_UNISTD_H', 1) +endif if cc.links('int main(){if(__builtin_expect(1<0,0)){}}', name: '__builtin_expect') configh_data.set('HAVE___BUILTIN_EXPECT', 1) endif @@ -117,8 +125,14 @@ elif cc.has_header_symbol('stdlib.h', '__secure_getenv', prefix: system_ext_defi else message('C library does not support secure_getenv, using getenv instead') endif -have_getopt_long = cc.has_header_symbol('getopt.h', 'getopt_long', - prefix: '#define _GNU_SOURCE') +if not cc.has_header_symbol('limits.h', 'PATH_MAX', prefix: system_ext_define) + if host_machine.system() == 'windows' + # see https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file#maximum-path-length-limitation + configh_data.set('PATH_MAX', 260) + else + configh_data.set('PATH_MAX', 4096) + endif +endif # Silence some security & deprecation warnings on MSVC # for some unix/C functions we use. @@ -136,6 +150,7 @@ have_version_script = cc.links( name: '-Wl,--version-script', ) +map_to_def = find_program('scripts/map-to-def') # libxkbcommon. # Note: we use some yacc extensions, which work with either GNU bison @@ -145,7 +160,7 @@ if bison.found() yacc_gen = generator( bison, output: ['@BASENAME@.c', '@BASENAME@.h'], - arguments: ['@INPUT@', '--defines=@OUTPUT1@', '--output=@OUTPUT0@', '-p _xkbcommon_'], + arguments: ['--defines=@OUTPUT1@', '-o', '@OUTPUT0@', '-p', '_xkbcommon_', '@INPUT@'], ) else byacc = find_program('byacc', required: false) @@ -153,7 +168,7 @@ else yacc_gen = generator( byacc, output: ['@BASENAME@.c', '@BASENAME@.h'], - arguments: ['@INPUT@', '-H', '@OUTPUT1@', '-o', '@OUTPUT0@', '-p _xkbcommon_'], + arguments: ['-H', '@OUTPUT1@', '-o', '@OUTPUT0@', '-p', '_xkbcommon_', '@INPUT@'], ) else error('Could not find a compatible YACC program (bison or byacc)') @@ -215,30 +230,42 @@ libxkbcommon_sources = [ 'src/utils.h', ] libxkbcommon_link_args = [] +libxkbcommon_link_deps = [] if have_version_script libxkbcommon_link_args += '-Wl,--version-script=' + meson.source_root()/'xkbcommon.map' + libxkbcommon_link_deps += 'xkbcommon.map' +elif cc.get_argument_syntax() == 'msvc' + libxkbcommon_def = custom_target('xkbcommon.def', + command: [map_to_def, '@INPUT@', '@OUTPUT@'], + input: 'xkbcommon.map', + output: 'kxbcommon.def', + ) + libxkbcommon_link_deps += libxkbcommon_def + libxkbcommon_link_args += '/DEF:' + libxkbcommon_def.full_path() endif libxkbcommon = library( 'xkbcommon', - 'xkbcommon/xkbcommon.h', + 'include/xkbcommon/xkbcommon.h', libxkbcommon_sources, link_args: libxkbcommon_link_args, - link_depends: 'xkbcommon.map', + link_depends: libxkbcommon_link_deps, gnu_symbol_visibility: 'hidden', version: '0.0.0', install: true, - include_directories: include_directories('src'), + include_directories: include_directories('src', 'include'), ) install_headers( - 'xkbcommon/xkbcommon.h', - 'xkbcommon/xkbcommon-compat.h', - 'xkbcommon/xkbcommon-compose.h', - 'xkbcommon/xkbcommon-keysyms.h', - 'xkbcommon/xkbcommon-names.h', + 'include/xkbcommon/xkbcommon.h', + 'include/xkbcommon/xkbcommon-compat.h', + 'include/xkbcommon/xkbcommon-compose.h', + 'include/xkbcommon/xkbcommon-keysyms.h', + 'include/xkbcommon/xkbcommon-names.h', subdir: 'xkbcommon', ) -libxkbcommon_dep = declare_dependency( + +dep_libxkbcommon = declare_dependency( link_with: libxkbcommon, + include_directories: include_directories('include'), ) pkgconfig.generate( libxkbcommon, @@ -271,19 +298,29 @@ You can disable X11 support with -Denable-x11=false.''') 'src/atom.c', ] libxkbcommon_x11_link_args = [] + libxkbcommon_x11_link_deps = [] if have_version_script libxkbcommon_x11_link_args += '-Wl,--version-script=' + meson.source_root()/'xkbcommon-x11.map' + libxkbcommon_x11_link_deps += 'xkbcommon-x11.map' + elif cc.get_argument_syntax() == 'msvc' + libxkbcommon_x11_def = custom_target('xkbcommon-x11.def', + command: [map_to_def, '@INPUT@', '@OUTPUT@'], + input: 'xkbcommon-x11.map', + output: 'xkbcommon-x11.def', + ) + libxkbcommon_x11_link_deps += libxkbcommon_x11_def + libxkbcommon_x11_link_args += '/DEF:' + libxkbcommon_x11_def.full_path() endif libxkbcommon_x11 = library( 'xkbcommon-x11', - 'xkbcommon/xkbcommon-x11.h', + 'include/xkbcommon/xkbcommon-x11.h', libxkbcommon_x11_sources, link_args: libxkbcommon_x11_link_args, - link_depends: 'xkbcommon-x11.map', + link_depends: libxkbcommon_x11_link_deps, gnu_symbol_visibility: 'hidden', version: '0.0.0', install: true, - include_directories: include_directories('src'), + include_directories: include_directories('src', 'include'), link_with: libxkbcommon, dependencies: [ xcb_dep, @@ -291,11 +328,12 @@ You can disable X11 support with -Denable-x11=false.''') ], ) install_headers( - 'xkbcommon/xkbcommon-x11.h', + 'include/xkbcommon/xkbcommon-x11.h', subdir: 'xkbcommon', ) - libxkbcommon_x11_dep = declare_dependency( + dep_libxkbcommon_x11 = declare_dependency( link_with: libxkbcommon_x11, + include_directories: include_directories('include'), ) pkgconfig.generate( libxkbcommon_x11, @@ -320,23 +358,33 @@ if get_option('enable-xkbregistry') 'src/util-list.c', ] libxkbregistry_link_args = [] + libxkbregistry_link_deps = [] if have_version_script libxkbregistry_link_args += '-Wl,--version-script=' + meson.source_root()/'xkbregistry.map' + libxkbregistry_link_deps += 'xkbregistry.map' + elif cc.get_argument_syntax() == 'msvc' + libxkbregistry_def = custom_target('xkbregistry.def', + command: [map_to_def, '@INPUT@', '@OUTPUT@'], + input: 'xkbregistry.map', + output: 'xkbregistry.def', + ) + libxkbregistry_link_deps += libxkbregistry_def + libxkbregistry_link_args += '/DEF:' + libxkbregistry_def.full_path() endif libxkbregistry = library( 'xkbregistry', - 'xkbcommon/xkbregistry.h', + 'include/xkbcommon/xkbregistry.h', libxkbregistry_sources, link_args: libxkbregistry_link_args, - link_depends: 'xkbregistry.map', + link_depends: libxkbregistry_link_deps, gnu_symbol_visibility: 'hidden', dependencies: deps_libxkbregistry, version: '0.0.0', install: true, - include_directories: include_directories('src'), + include_directories: include_directories('src', 'include'), ) install_headers( - 'xkbcommon/xkbregistry.h', + 'include/xkbcommon/xkbregistry.h', subdir: 'xkbcommon', ) pkgconfig.generate( @@ -348,17 +396,150 @@ if get_option('enable-xkbregistry') ) dep_libxkbregistry = declare_dependency( - include_directories: include_directories('xkbcommon'), - link_with: libxkbregistry - ) + link_with: libxkbregistry, + include_directories: include_directories('include'), + ) +endif + +man_pages = [] + +# Tools +build_tools = get_option('enable-tools') and cc.has_header_symbol('getopt.h', 'getopt_long', prefix: '#define _GNU_SOURCE') +if build_tools + libxkbcommon_tools_internal = static_library( + 'tools-internal', + 'tools/tools-common.h', + 'tools/tools-common.c', + dependencies: dep_libxkbcommon, + ) + tools_dep = declare_dependency( + include_directories: [include_directories('tools', 'include')], + link_with: libxkbcommon_tools_internal, + ) + + executable('xkbcli', 'tools/xkbcli.c', + dependencies: tools_dep, install: true) + install_man('tools/xkbcli.1') + + xkbcli_compile_keymap = executable('xkbcli-compile-keymap', + 'tools/compile-keymap.c', + dependencies: tools_dep, + install: true, + install_dir: dir_libexec) + install_man('tools/xkbcli-compile-keymap.1') + # The same tool again, but with access to some private APIs. + executable('compile-keymap', + 'tools/compile-keymap.c', + libxkbcommon_sources, + dependencies: [tools_dep], + c_args: ['-DENABLE_PRIVATE_APIS'], + include_directories: [include_directories('src', 'include')], + install: false) + executable('compose', + 'tools/compose.c', + dependencies: tools_dep, + include_directories: [include_directories('src', 'include')], + install: false) + configh_data.set10('HAVE_XKBCLI_COMPILE_KEYMAP', true) + executable('xkbcli-how-to-type', + 'tools/how-to-type.c', + dependencies: tools_dep, + install: true, + install_dir: dir_libexec) + install_man('tools/xkbcli-how-to-type.1') + configh_data.set10('HAVE_XKBCLI_HOW_TO_TYPE', true) + if cc.has_header('linux/input.h') + executable('xkbcli-interactive-evdev', + 'tools/interactive-evdev.c', + dependencies: tools_dep, + install: true, + install_dir: dir_libexec) + configh_data.set10('HAVE_XKBCLI_INTERACTIVE_EVDEV', true) + install_man('tools/xkbcli-interactive-evdev.1') + endif + if get_option('enable-x11') + x11_tools_dep = declare_dependency( + link_with: libxkbcommon_x11, + dependencies: [ + tools_dep, + xcb_dep, + xcb_xkb_dep, + ], + ) + executable('xkbcli-interactive-x11', + 'tools/interactive-x11.c', + dependencies: x11_tools_dep, + install: true, + install_dir: dir_libexec) + install_man('tools/xkbcli-interactive-x11.1') + configh_data.set10('HAVE_XKBCLI_INTERACTIVE_X11', true) + endif + if get_option('enable-wayland') + wayland_client_dep = dependency('wayland-client', version: '>=1.2.0', required: false) + wayland_protocols_dep = dependency('wayland-protocols', version: '>=1.12', required: false) + wayland_scanner_dep = dependency('wayland-scanner', required: false, native: true) + if not wayland_client_dep.found() or not wayland_protocols_dep.found() or not wayland_scanner_dep.found() + error('''The Wayland xkbcli programs require wayland-client >= 1.2.0, wayland-protocols >= 1.7 which were not found. +You can disable the Wayland xkbcli programs with -Denable-wayland=false.''') + endif + + wayland_scanner = find_program(wayland_scanner_dep.get_pkgconfig_variable('wayland_scanner')) + wayland_scanner_code_gen = generator( + wayland_scanner, + output: '@BASENAME@-protocol.c', + arguments: ['code', '@INPUT@', '@OUTPUT@'], + ) + wayland_scanner_client_header_gen = generator( + wayland_scanner, + output: '@BASENAME@-client-protocol.h', + arguments: ['client-header', '@INPUT@', '@OUTPUT@'], + ) + wayland_protocols_datadir = wayland_protocols_dep.get_pkgconfig_variable('pkgdatadir') + xdg_shell_xml = wayland_protocols_datadir/'stable/xdg-shell/xdg-shell.xml' + xdg_shell_sources = [ + wayland_scanner_code_gen.process(xdg_shell_xml), + wayland_scanner_client_header_gen.process(xdg_shell_xml), + ] + executable('xkbcli-interactive-wayland', + 'tools/interactive-wayland.c', + xdg_shell_sources, + dependencies: [tools_dep, wayland_client_dep], + install: true, + install_dir: dir_libexec) + install_man('tools/xkbcli-interactive-wayland.1') + configh_data.set10('HAVE_XKBCLI_INTERACTIVE_WAYLAND', true) + endif + + if get_option('enable-xkbregistry') + configh_data.set10('HAVE_XKBCLI_LIST', true) + executable('xkbcli-list', + 'tools/registry-list.c', + dependencies: dep_libxkbregistry, + install: true, + install_dir: dir_libexec) + install_man('tools/xkbcli-list.1') + endif endif + +# xkeyboard-config "verifier" +xkct_config = configuration_data() +xkct_config.set('MESON_BUILD_ROOT', meson.build_root()) +xkct_config.set('XKB_CONFIG_ROOT', XKBCONFIGROOT) +configure_file(input: 'test/xkeyboard-config-test.py.in', + output: 'xkeyboard-config-test', + configuration: xkct_config) + # Tests test_env = environment() test_env.set('XKB_LOG_LEVEL', 'debug') test_env.set('XKB_LOG_VERBOSITY', '10') test_env.set('top_srcdir', meson.source_root()) test_env.set('top_builddir', meson.build_root()) +test_env.set('HAVE_XKBCLI_INTERACTIVE_EVDEV', configh_data.get('HAVE_XKBCLI_INTERACTIVE_EVDEV', 0).to_string()) +test_env.set('HAVE_XKBCLI_INTERACTIVE_WAYLAND', configh_data.get('HAVE_XKBCLI_INTERACTIVE_WAYLAND', 0).to_string()) +test_env.set('HAVE_XKBCLI_INTERACTIVE_X11', configh_data.get('HAVE_XKBCLI_INTERACTIVE_X11', 0).to_string()) +test_env.set('HAVE_XKBCLI_LIST', configh_data.get('HAVE_XKBCLI_LIST', 0).to_string()) test_configh_data = configuration_data() test_configh_data.set_quoted('TEST_XKB_CONFIG_ROOT', meson.source_root()/'test'/'data') @@ -371,18 +552,20 @@ libxkbcommon_test_internal = static_library( 'test/common.c', 'test/test.h', 'test/evdev-scancodes.h', + 'bench/bench.c', + 'bench/bench.h', libxkbcommon_sources, - include_directories: include_directories('src'), + include_directories: include_directories('src', 'include'), ) test_dep = declare_dependency( - include_directories: include_directories('src'), + include_directories: include_directories('src', 'include'), link_with: libxkbcommon_test_internal, ) if get_option('enable-x11') libxkbcommon_x11_internal = static_library( 'xkbcommon-x11-internal', libxkbcommon_x11_sources, - include_directories: include_directories('src'), + include_directories: include_directories('src', 'include'), link_with: libxkbcommon_test_internal, dependencies: [ xcb_dep, @@ -506,6 +689,28 @@ if get_option('enable-xkbregistry') env: test_env, ) endif +if build_tools + test('tool-option-parsing', + find_program('test/tool-option-parsing.py'), + env: test_env, + suite: ['python-tests']) + + # A set of keysyms to test for. Add one or two symbols to this array + # whenever the xorgproto gets updated to make sure we resolve them. + keysyms_to_test = [ + 'XF86Macro23', + ] + + env = environment() + env.set('XKB_CONFIG_ROOT', meson.source_root()/'test'/'data') + foreach keysym: keysyms_to_test + test('keysym-test-@0@'.format(keysym), + find_program('test/test-keysym.py'), + env: env, + args: [keysym, '--tool', xkbcli_compile_keymap], + suite: ['python-tests']) + endforeach +endif valgrind = find_program('valgrind', required: false) if valgrind.found() @@ -525,169 +730,42 @@ endif executable('fuzz-keymap', 'fuzz/keymap/target.c', dependencies: test_dep) executable('fuzz-compose', 'fuzz/compose/target.c', dependencies: test_dep) -man_pages = [] - -# Tools -build_tools = have_getopt_long -if build_tools - libxkbcommon_tools_internal = static_library( - 'tools-internal', - 'tools/tools-common.h', - 'tools/tools-common.c', - dependencies: libxkbcommon_dep, - ) - tools_dep = declare_dependency( - include_directories: [include_directories('tools')], - link_with: libxkbcommon_tools_internal, - ) - - executable('xkbcli', 'tools/xkbcli.c', - dependencies: tools_dep, install: true) - install_man('tools/xkbcli.1') - - executable('xkbcli-compile-keymap', - 'tools/compile-keymap.c', - dependencies: tools_dep, - install: true, - install_dir: dir_libexec) - install_man('tools/xkbcli-compile-keymap.1') - # The same tool again, but with access to some private APIs. - executable('compile-keymap', - 'tools/compile-keymap.c', - libxkbcommon_sources, - dependencies: [tools_dep], - c_args: ['-DENABLE_PRIVATE_APIS'], - include_directories: [include_directories('src')], - install: false) - configh_data.set10('HAVE_XKBCLI_COMPILE_KEYMAP', true) - executable('xkbcli-how-to-type', - 'tools/how-to-type.c', - dependencies: tools_dep, - install: true, - install_dir: dir_libexec) - install_man('tools/xkbcli-how-to-type.1') - configh_data.set10('HAVE_XKBCLI_HOW_TO_TYPE', true) - if cc.has_header('linux/input.h') - executable('xkbcli-interactive-evdev', - 'tools/interactive-evdev.c', - dependencies: tools_dep, - install: true, - install_dir: dir_libexec) - configh_data.set10('HAVE_XKBCLI_INTERACTIVE_EVDEV', true) - install_man('tools/xkbcli-interactive-evdev.1') - endif - if get_option('enable-x11') - x11_tools_dep = declare_dependency( - link_with: libxkbcommon_x11, - dependencies: [ - tools_dep, - xcb_dep, - xcb_xkb_dep, - ], - ) - executable('xkbcli-interactive-x11', - 'tools/interactive-x11.c', - dependencies: x11_tools_dep, - install: true, - install_dir: dir_libexec) - install_man('tools/xkbcli-interactive-x11.1') - configh_data.set10('HAVE_XKBCLI_INTERACTIVE_X11', true) - endif - if get_option('enable-wayland') - wayland_client_dep = dependency('wayland-client', version: '>=1.2.0', required: false) - wayland_protocols_dep = dependency('wayland-protocols', version: '>=1.12', required: false) - wayland_scanner_dep = dependency('wayland-scanner', required: false, native: true) - if not wayland_client_dep.found() or not wayland_protocols_dep.found() or not wayland_scanner_dep.found() - error('''The Wayland xkbcli programs require wayland-client >= 1.2.0, wayland-protocols >= 1.7 which were not found. -You can disable the Wayland xkbcli programs with -Denable-wayland=false.''') - endif - - wayland_scanner = find_program(wayland_scanner_dep.get_pkgconfig_variable('wayland_scanner')) - wayland_scanner_code_gen = generator( - wayland_scanner, - output: '@BASENAME@-protocol.c', - arguments: ['code', '@INPUT@', '@OUTPUT@'], - ) - wayland_scanner_client_header_gen = generator( - wayland_scanner, - output: '@BASENAME@-client-protocol.h', - arguments: ['client-header', '@INPUT@', '@OUTPUT@'], - ) - wayland_protocols_datadir = wayland_protocols_dep.get_pkgconfig_variable('pkgdatadir') - xdg_shell_xml = wayland_protocols_datadir/'stable/xdg-shell/xdg-shell.xml' - xdg_shell_sources = [ - wayland_scanner_code_gen.process(xdg_shell_xml), - wayland_scanner_client_header_gen.process(xdg_shell_xml), - ] - executable('xkbcli-interactive-wayland', - 'tools/interactive-wayland.c', - xdg_shell_sources, - dependencies: [tools_dep, wayland_client_dep], - install: true, - install_dir: dir_libexec) - install_man('tools/xkbcli-interactive-wayland.1') - configh_data.set10('HAVE_XKBCLI_INTERACTIVE_WAYLAND', true) - endif - - if get_option('enable-xkbregistry') - configh_data.set10('HAVE_XKBCLI_LIST', true) - executable('xkbcli-list', - 'tools/registry-list.c', - dependencies: dep_libxkbregistry, - install: true, - install_dir: dir_libexec) - install_man('tools/xkbcli-list.1') - endif - - test('tool-option-parsing', - find_program('test/tool-option-parsing.py'), - env: test_env, - suite: ['python-tests']) -endif - - -# xkeyboard-config "verifier" -xkct_config = configuration_data() -xkct_config.set('MESON_BUILD_ROOT', meson.build_root()) -xkct_config.set('XKB_CONFIG_ROOT', XKBCONFIGROOT) -configure_file(input: 'test/xkeyboard-config-test.py.in', - output: 'xkeyboard-config-test', - configuration: xkct_config) - # Benchmarks. -libxkbcommon_bench_internal = static_library( - 'xkbcommon-bench-internal', - 'bench/bench.c', - 'bench/bench.h', - link_with: libxkbcommon_test_internal, -) -bench_dep = declare_dependency( - include_directories: include_directories('src'), - link_with: libxkbcommon_bench_internal, -) bench_env = environment() bench_env.set('top_srcdir', meson.source_root()) benchmark( 'key-proc', - executable('bench-key-proc', 'bench/key-proc.c', dependencies: bench_dep), + executable('bench-key-proc', 'bench/key-proc.c', dependencies: test_dep), env: bench_env, ) benchmark( 'rules', - executable('bench-rules', 'bench/rules.c', dependencies: bench_dep), + executable('bench-rules', 'bench/rules.c', dependencies: test_dep), env: bench_env, ) benchmark( 'rulescomp', - executable('bench-rulescomp', 'bench/rulescomp.c', dependencies: bench_dep), + executable('bench-rulescomp', 'bench/rulescomp.c', dependencies: test_dep), env: bench_env, ) benchmark( 'compose', - executable('bench-compose', 'bench/compose.c', dependencies: bench_dep), + executable('bench-compose', 'bench/compose.c', dependencies: test_dep), env: bench_env, ) +benchmark( + 'atom', + executable('bench-atom', 'bench/atom.c', dependencies: test_dep), + env: bench_env, +) +if get_option('enable-x11') + benchmark( + 'x11', + executable('bench-x11', 'bench/x11.c', dependencies: x11_test_dep), + env: bench_env, + ) +endif # Documentation. @@ -706,11 +784,12 @@ You can disable the documentation with -Denable-docs=false.''') 'doc/compat.md', 'doc/user-configuration.md', 'doc/rules-format.md', - 'xkbcommon/xkbcommon.h', - 'xkbcommon/xkbcommon-names.h', - 'xkbcommon/xkbcommon-x11.h', - 'xkbcommon/xkbcommon-compose.h', - 'xkbcommon/xkbregistry.h', + 'doc/keymap-format-text-v1.md', + 'include/xkbcommon/xkbcommon.h', + 'include/xkbcommon/xkbcommon-names.h', + 'include/xkbcommon/xkbcommon-x11.h', + 'include/xkbcommon/xkbcommon-compose.h', + 'include/xkbcommon/xkbregistry.h', ] doxygen_data = configuration_data() doxygen_data.set('PACKAGE_NAME', meson.project_name()) @@ -736,3 +815,14 @@ You can disable the documentation with -Denable-docs=false.''') endif configure_file(output: 'config.h', configuration: configh_data) + + +# Stable variables for projects using xkbcommon as a subproject. +# These variables should not be renamed. +libxkbcommon_dep = dep_libxkbcommon +if get_option('enable-x11') + libxkbcommon_x11_dep = dep_libxkbcommon_x11 +endif +if get_option('enable-xkbregistry') + libxkbregistry_dep = dep_libxkbregistry +endif