diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-06-24 18:10:48 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-06-25 09:23:14 +0200 |
| commit | 2df4991cb1a893522caac838d6c4edf5ad8da464 (patch) | |
| tree | 9e5f22c510f95ac4ed58dbb6183770ae96bcd90f | |
| parent | a0bd8c7893d9f8c93db6c6640dd5135e42b60303 (diff) | |
CMake: Fix qmake mixing with static build and system_xcb_input
The .prl generation uses a very simple generator expression evaluator
that cannot cope with the $<TARGET_EXISTS> expression used in
src/plugins/platforms/xcb/CMakeLists.txt.
Replace this genex with a conditional qt_extend_target call.
Change-Id: Id17a230d66f701eb0938d10d6b6b7b680290b1c8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | src/plugins/platforms/xcb/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index 5cb208a7f2..352a071df7 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -56,7 +56,6 @@ qt_add_module(XcbQpa XCB::XCB XCB::XFIXES XCB::XINERAMA - $<$<TARGET_EXISTS:XCB::XINPUT>:XCB::XINPUT> # special case XCB::XKB XKB::XKB ) @@ -146,7 +145,9 @@ qt_extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_nativ ) # special case begin -if (NOT QT_FEATURE_system_xcb_input) +if(TARGET XCB::XINPUT) + qt_extend_target(XcbQpa LIBRARIES XCB::XINPUT) +else() set(xinput_source "${PROJECT_SOURCE_DIR}/src/3rdparty/xcb/libxcb/xinput.c") set_source_files_properties( "${xinput_source}" |