1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Prevent creation of empty InputSupportPrivate module

Browse Source 
The combination of
    -no-feature-evdev
    -no-feature-tslib
    -no-feature-libinput
led to the creation of the InputSupportPrivate module without source
files.

This triggered CMake upstream issue 23464 when using CMake < 3.25.

Fix this by adjusting the inexact condition that decides whether to
build InputSupportPrivate.

Pick-to: 6.8 6.9
Fixes: QTBUG-99957
Change-Id: If23d029f21811b6ff7c92ac9ecd2882aedb309d6
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
Joerg Bornemann 2025-03-21 10:26:12 +01:00
parent dc2a73cef5
commit cf2efa90fa
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/platformsupport/CMakeLists.txt
View File

@ -5,7 +5,12 @@ if(NOT WASM)
add_subdirectory(devicediscovery)
add_subdirectory(fbconvenience)
endif()
if(QT_FEATURE_evdev OR QT_FEATURE_integrityhid OR QT_FEATURE_libinput OR QT_FEATURE_tslib OR QT_FEATURE_xkbcommon OR QT_FEATURE_vxworksevdev)
if(QT_FEATURE_evdev
OR QT_FEATURE_vxworksevdev
OR QT_FEATURE_integrityhid
OR QT_FEATURE_libinput
OR QT_FEATURE_tslib
OR (QT_FEATURE_libinput AND QT_FEATURE_xkbcommon))
add_subdirectory(input)
endif()
if(QT_FEATURE_kms)