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/ECMAddQch.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/ECMAddQch.cmake')
| -rw-r--r-- | modules/ECMAddQch.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/ECMAddQch.cmake b/modules/ECMAddQch.cmake index 8ba91768..f494c543 100644 --- a/modules/ECMAddQch.cmake +++ b/modules/ECMAddQch.cmake @@ -257,6 +257,7 @@ Since 5.36.0. #]=======================================================================] include(CMakeParseArguments) +include(${CMAKE_CURRENT_LIST_DIR}/../modules/QtVersionOption.cmake) include(ECMQueryQmake) @@ -279,7 +280,7 @@ function(_ecm_ensure_qt_qch_targets) # Ideally one day Qt CMake Config files provide these if(NOT TARGET Qt5Core_QCH) # get Qt version, if any - find_package(Qt5Core CONFIG QUIET) + find_package(Qt${QT_MAJOR_VERSION}Core CONFIG QUIET) # lookup tag files query_qmake(qt_docs_dir QT_INSTALL_DOCS TRY) find_path(_qtcoreTagsPath qtcore/qtcore.tags |