diff options
| author | Volker Krause <vkrause@kde.org> | 2021-11-30 17:01:46 +0100 |
|---|---|---|
| committer | Christophe Giboudeaux <christophe@krop.fr> | 2021-12-01 07:53:28 +0000 |
| commit | 2f2062114c4312f669bd5d101bbd1ec083e4f5a7 (patch) | |
| tree | 4b0576fbea092fea2fdf75289435dc6c7f3b120e /modules/ECMAddQtDesignerPlugin.cmake | |
| parent | 53a640542786bd80a54c29062a0047c82d2f1dc3 (diff) | |
| download | extra-cmake-modules-2f2062114c4312f669bd5d101bbd1ec083e4f5a7.tar.gz extra-cmake-modules-2f2062114c4312f669bd5d101bbd1ec083e4f5a7.tar.bz2 | |
Include QtVersionOption before all Qt5 find_package calls
This doesn't make all these modules actually work with Qt6 yet, but it
prevents them from unconditionally pulling in Qt5 in a Qt6 build.
This is useful in order to even be able to pass a CMake run to the
point one can port, test and debug the rest.
Diffstat (limited to 'modules/ECMAddQtDesignerPlugin.cmake')
| -rw-r--r-- | modules/ECMAddQtDesignerPlugin.cmake | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/modules/ECMAddQtDesignerPlugin.cmake b/modules/ECMAddQtDesignerPlugin.cmake index 7d3dfb69..72dc683f 100644 --- a/modules/ECMAddQtDesignerPlugin.cmake +++ b/modules/ECMAddQtDesignerPlugin.cmake @@ -179,6 +179,7 @@ Since 5.62.0. #]=======================================================================] include(CMakeParseArguments) +include(${CMAKE_CURRENT_LIST_DIR}/QtVersionOption.cmake) # helper method # escapes string for C++ code @@ -442,7 +443,7 @@ macro(ecm_add_qtdesignerplugin target) # Check deps # peek at Qt5Core to learn about the version to decide whether Qt5UiPlugin is enough if(NOT Qt5Core_FOUND) - find_package(Qt5Core QUIET CONFIG) + find_package(Qt${QT_MAJOR_VERSION}Core QUIET CONFIG) endif() if(Qt5Core_VERSION VERSION_LESS "5.5.0") set(_qtdesigner_tobefound TRUE) @@ -454,15 +455,15 @@ macro(ecm_add_qtdesignerplugin target) set(_qtuiplugin_tobefound TRUE) endif() if(NOT Qt5Designer_FOUND AND _qtdesigner_tobefound) - find_package(Qt5Designer QUIET CONFIG) - set_package_properties(Qt5Designer PROPERTIES + find_package(Qt${QT_MAJOR_VERSION}Designer QUIET CONFIG) + set_package_properties(Qt${QT_MAJOR_VERSION}Designer PROPERTIES PURPOSE "Required to build Qt Designer plugins" TYPE REQUIRED ) endif() if(NOT Qt5UiPlugin_FOUND AND _qtuiplugin_tobefound) - find_package(Qt5UiPlugin QUIET CONFIG) - set_package_properties(Qt5UiPlugin PROPERTIES + find_package(Qt${QT_MAJOR_VERSION}UiPlugin QUIET CONFIG) + set_package_properties(Qt${QT_MAJOR_VERSION}UiPlugin PROPERTIES PURPOSE "Required to build Qt Designer plugins" TYPE REQUIRED ) |