From 2f2062114c4312f669bd5d101bbd1ec083e4f5a7 Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Tue, 30 Nov 2021 17:01:46 +0100 Subject: 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. --- modules/ECMQueryQmake.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'modules/ECMQueryQmake.cmake') 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") -- cgit v1.2.1