From b3b836e70388edcf1d18b114cd128c7b89a79199 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 21 Mar 2025 10:26:12 +0100 Subject: [PATCH] CMake: Prevent creation of empty InputSupportPrivate module 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 Fixes: QTBUG-99957 Change-Id: If23d029f21811b6ff7c92ac9ecd2882aedb309d6 Reviewed-by: Alexey Edelev (cherry picked from commit cf2efa90fa92898f71861fca8100d7ac72244dae) Reviewed-by: Alexandru Croitor --- src/platformsupport/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt index eb8128c0c8d..6899250b308 100644 --- a/src/platformsupport/CMakeLists.txt +++ b/src/platformsupport/CMakeLists.txt @@ -3,7 +3,12 @@ add_subdirectory(devicediscovery) add_subdirectory(fbconvenience) -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)