Fix building X11 tests on PE targets
Link libxkbcommon_x11_internal with libxkbcommon_test_internal, rather than libxkbcommon. This avoids some tests linking with both libxkbcommon_test_internal and libxkbcommon, which causes duplicate symbol problems on PE targets (e.g. Cygwin) (as all the symbols from libxkbcommon are pulled in at link time, which clash with libxkbcommon_test_internal)master
parent
ed5a0b4fed
commit
908e014f01
20
meson.build
20
meson.build
|
@ -262,16 +262,6 @@ You can disable X11 support with -Denable-x11=false.''')
|
|||
'src/atom.h',
|
||||
'src/atom.c',
|
||||
]
|
||||
libxkbcommon_x11_internal = static_library(
|
||||
'xkbcommon-x11-internal',
|
||||
libxkbcommon_x11_sources,
|
||||
include_directories: include_directories('src'),
|
||||
link_with: libxkbcommon,
|
||||
dependencies: [
|
||||
xcb_dep,
|
||||
xcb_xkb_dep,
|
||||
],
|
||||
)
|
||||
libxkbcommon_x11_link_args = []
|
||||
if have_version_script
|
||||
libxkbcommon_x11_link_args += '-Wl,--version-script=' + join_paths(meson.source_root(), 'xkbcommon-x11.map')
|
||||
|
@ -333,6 +323,16 @@ test_dep = declare_dependency(
|
|||
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'),
|
||||
link_with: libxkbcommon_test_internal,
|
||||
dependencies: [
|
||||
xcb_dep,
|
||||
xcb_xkb_dep,
|
||||
],
|
||||
)
|
||||
x11_test_dep = declare_dependency(
|
||||
link_with: libxkbcommon_x11_internal,
|
||||
dependencies: [
|
||||
|
|
Loading…
Reference in New Issue