From bc29555e6e2335e4079a9fd2f1a7e2991da87e46 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 14 Jul 2020 11:25:47 +0200 Subject: CMake: Fix old style find_package(Qt6Foo) to work Each module package needs to first find the Qt6 package to ensure that all the necessary info is setup for further depedencies to be found. Task-number: QTBUG-81672 Change-Id: I3ee608d24c1efbb63a063261fb36341bf52fb78d Reviewed-by: Joerg Bornemann --- cmake/QtModuleDependencies.cmake.in | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'cmake/QtModuleDependencies.cmake.in') diff --git a/cmake/QtModuleDependencies.cmake.in b/cmake/QtModuleDependencies.cmake.in index 5d94eb9a5d..4fdeb33c46 100644 --- a/cmake/QtModuleDependencies.cmake.in +++ b/cmake/QtModuleDependencies.cmake.in @@ -1,3 +1,12 @@ +# Make sure @INSTALL_CMAKE_NAMESPACE@ is found before anything else. +find_dependency(@INSTALL_CMAKE_NAMESPACE@ @PROJECT_VERSION@ + PATHS "${CMAKE_CURRENT_LIST_DIR}/.." ${QT_EXAMPLES_CMAKE_PREFIX_PATH} NO_DEFAULT_PATH +) +if (NOT @INSTALL_CMAKE_NAMESPACE@_FOUND) + set(@INSTALL_CMAKE_NAMESPACE@@target@_FOUND FALSE) + return() +endif() + # note: _third_party_deps example: "ICU\\;1.0\\;i18n uc data;ZLIB\\;\\;" set(_third_party_deps "@third_party_deps@") -- cgit v1.2.3