meson.build: registry list is dependent on getopt_long
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>master
parent
9cff8df2b1
commit
90ece8fb0a
15
meson.build
15
meson.build
|
@ -118,6 +118,9 @@ elif cc.has_header_symbol('stdlib.h', '__secure_getenv', prefix: system_ext_defi
|
||||||
else
|
else
|
||||||
message('C library does not support secure_getenv, using getenv instead')
|
message('C library does not support secure_getenv, using getenv instead')
|
||||||
endif
|
endif
|
||||||
|
have_getopt_long = cc.has_header_symbol('getopt.h', 'getopt_long',
|
||||||
|
prefix: '#define _GNU_SOURCE')
|
||||||
|
|
||||||
# Silence some security & deprecation warnings on MSVC
|
# Silence some security & deprecation warnings on MSVC
|
||||||
# for some unix/C functions we use.
|
# for some unix/C functions we use.
|
||||||
# https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-3-c4996?view=vs-2019
|
# https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-3-c4996?view=vs-2019
|
||||||
|
@ -342,10 +345,12 @@ if get_option('enable-xkbregistry')
|
||||||
include_directories: include_directories('xkbcommon'),
|
include_directories: include_directories('xkbcommon'),
|
||||||
link_with: libxkbregistry
|
link_with: libxkbregistry
|
||||||
)
|
)
|
||||||
executable('xkbcommon-registry-list',
|
if have_getopt_long
|
||||||
'tools/registry-list.c',
|
executable('xkbcommon-registry-list',
|
||||||
dependencies: dep_libxkbregistry,
|
'tools/registry-list.c',
|
||||||
install: false)
|
dependencies: dep_libxkbregistry,
|
||||||
|
install: false)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Tests
|
# Tests
|
||||||
|
@ -534,7 +539,7 @@ tools_dep = declare_dependency(
|
||||||
link_with: libxkbcommon_tools_internal,
|
link_with: libxkbcommon_tools_internal,
|
||||||
)
|
)
|
||||||
|
|
||||||
if cc.has_header_symbol('getopt.h', 'getopt_long', prefix: '#define _GNU_SOURCE')
|
if have_getopt_long
|
||||||
executable('xkbcommon-rmlvo-to-keymap', 'tools/rmlvo-to-keymap.c', dependencies: tools_dep)
|
executable('xkbcommon-rmlvo-to-keymap', 'tools/rmlvo-to-keymap.c', dependencies: tools_dep)
|
||||||
executable('xkbcommon-how-to-type', 'tools/how-to-type.c', dependencies: tools_dep)
|
executable('xkbcommon-how-to-type', 'tools/how-to-type.c', dependencies: tools_dep)
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue