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/ECMPoQmTools.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'modules/ECMPoQmTools.cmake') diff --git a/modules/ECMPoQmTools.cmake b/modules/ECMPoQmTools.cmake index 86480b71..bf9efe0e 100644 --- a/modules/ECMPoQmTools.cmake +++ b/modules/ECMPoQmTools.cmake @@ -83,6 +83,8 @@ Since pre-1.0.0. #]=======================================================================] include(CMakeParseArguments) +include(${CMAKE_CURRENT_LIST_DIR}/QtVersionOption.cmake) + # Copied from FindGettext.cmake function(_ecm_qm_get_unique_target_name _name _unique_name) @@ -143,7 +145,7 @@ function(ecm_process_po_files_as_qm lang) endif() # Find lrelease and lconvert - find_package(Qt5LinguistTools CONFIG REQUIRED) + find_package(Qt${QT_MAJOR_VERSION}LinguistTools CONFIG REQUIRED) if(TARGET Qt5::lconvert) set(lconvert_executable Qt5::lconvert) -- cgit v1.2.1