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/ECMQueryQmake.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/ECMQueryQmake.cmake')
-rw-r--r-- | modules/ECMQueryQmake.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/ECMQueryQmake.cmake b/modules/ECMQueryQmake.cmake index 74a6df87..4d7f9543 100644 --- a/modules/ECMQueryQmake.cmake +++ b/modules/ECMQueryQmake.cmake @@ -1,4 +1,5 @@ -find_package(Qt5Core QUIET) +include(${CMAKE_CURRENT_LIST_DIR}/QtVersionOption.cmake) +find_package(Qt${QT_MAJOR_VERSION}Core QUIET) if (Qt5Core_FOUND) set(_qmake_executable_default "qmake-qt5") |