From dc0b1dc67c669693f71020a57048d86d8b5330fa Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 28 Mar 2019 15:11:17 +0100 Subject: [PATCH] CMake: Re-generate platformsupport/input Change-Id: I4f3c4d6d0db2cb8d5a4cb2b71a7d7e08f043b88c Reviewed-by: Albert Astals Cid --- src/platformsupport/input/CMakeLists.txt | 31 +++++++++--------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/src/platformsupport/input/CMakeLists.txt b/src/platformsupport/input/CMakeLists.txt index 43fb26d303..bcd96a9cdb 100644 --- a/src/platformsupport/input/CMakeLists.txt +++ b/src/platformsupport/input/CMakeLists.txt @@ -1,16 +1,7 @@ -# Generated from input.pro. - -find_package(Libinput) -set_package_properties(Libinput PROPERTIES TYPE OPTIONAL) - -find_package(XKB) -set_package_properties(XKB PROPERTIES TYPE OPTIONAL) - -find_package(Tslib) -set_package_properties(Tslib PROPERTIES TYPE OPTIONAL) - -find_package(Mtdev) -set_package_properties(Mtdev PROPERTIES TYPE OPTIONAL) +find_package(Libinput) # special case +find_package(XKB) # special case +find_package(Tslib) # special case +find_package(Mtdev) # special case ##################################################################### ## InputSupport Module: @@ -22,14 +13,16 @@ add_qt_module(InputSupport QT_NO_CAST_FROM_ASCII LIBRARIES Qt::CorePrivate - Qt::GuiPrivate Qt::DeviceDiscoverySupportPrivate - # CONFIG = "static" "internal_module" - # MODULE = "input_support" - # PRECOMPILED_HEADER = "../../corelib/global/qt_pch.h" - # _LOADED = "qt_module" + Qt::GuiPrivate ) +#### Keys ignored in scope 1:.:input.pro:: +# CONFIG = "static" "internal_module" +# MODULE = "input_support" +# PRECOMPILED_HEADER = "../../corelib/global/qt_pch.h" +# _LOADED = "qt_module" + ## Scopes: ##################################################################### @@ -83,8 +76,8 @@ extend_target(InputSupport CONDITION QT_FEATURE_libinput INCLUDE_DIRECTORIES libinput/../shared LIBRARIES - PkgConfig::Libudev Libinput::Libinput + PkgConfig::Libudev ) extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon_evdev