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. --- find-modules/FindQHelpGenerator.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'find-modules/FindQHelpGenerator.cmake') diff --git a/find-modules/FindQHelpGenerator.cmake b/find-modules/FindQHelpGenerator.cmake index 1dbd8e41..b2590105 100644 --- a/find-modules/FindQHelpGenerator.cmake +++ b/find-modules/FindQHelpGenerator.cmake @@ -12,7 +12,8 @@ Finds the Qt5 QHelpGenerator QHelpGenerator_EXECUTABLE - Path to executable #]=======================================================================] -find_package(Qt5Help QUIET) +include(${CMAKE_CURRENT_LIST_DIR}/../modules/QtVersionOption.cmake) +find_package(Qt${QT_MAJOR_VERSION}Help QUIET) if (TARGET Qt5::qhelpgenerator) get_target_property(QHelpGenerator_EXECUTABLE Qt5::qhelpgenerator LOCATION) else() -- cgit v1.2.1