diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-09-13 12:16:44 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-09-13 12:21:06 +0200 |
| commit | 127fb8bb5587db52216d0ac934f3111170a7cbe3 (patch) | |
| tree | c19b047c68a40d57baa5682011bfafda9fff8187 /cmake/QtConfigDependencies.cmake.in | |
| parent | 6e1a570dc8560489d10120cbd019a665f33f49c2 (diff) | |
Revert "CMake: Fix usage of find_dependency()"
This reverts commit 58c1c6ee5c986d502b56eb1cc57f1d9444d42031.
This lead to configuration errors on some machines, blocking
development.
Change-Id: I744f6cc95fbaa273519ab8fc8fb492b87f5729b8
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'cmake/QtConfigDependencies.cmake.in')
| -rw-r--r-- | cmake/QtConfigDependencies.cmake.in | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/cmake/QtConfigDependencies.cmake.in b/cmake/QtConfigDependencies.cmake.in index e16d725928..301d808d8c 100644 --- a/cmake/QtConfigDependencies.cmake.in +++ b/cmake/QtConfigDependencies.cmake.in @@ -12,24 +12,24 @@ foreach(_target_dep ${_third_party_deps}) list(APPEND find_package_args "${version}") endif() - # Already build an error message, because find_dependency calls return() on failure. - set(__@INSTALL_CMAKE_NAMESPACE@_message "\nPackage: ${pkg}") - if(version) - string(APPEND __@INSTALL_CMAKE_NAMESPACE@_message "\nVersion: ${version}") - endif() - if(components) - string(APPEND __@INSTALL_CMAKE_NAMESPACE@_message "\nComponents: ${components}") - endif() - set(@INSTALL_CMAKE_NAMESPACE@_DEPENDENCY_NOT_FOUND_MESSAGE - "${__@INSTALL_CMAKE_NAMESPACE@_message}") - if(components) string(REPLACE " " ";" components "${components}") find_dependency(${find_package_args} COMPONENTS ${components}) else() find_dependency(${find_package_args}) endif() -endforeach() -set(@INSTALL_CMAKE_NAMESPACE@_DEPENDENCIES_FOUND TRUE) -unset(@INSTALL_CMAKE_NAMESPACE@_DEPENDENCY_NOT_FOUND_MESSAGE) + if (NOT ${pkg}_FOUND) + set(@INSTALL_CMAKE_NAMESPACE@_DEPENDENCIES_FOUND FALSE) + set(__@INSTALL_CMAKE_NAMESPACE@_message "\nPackage: ${pkg}") + if(version) + string(APPEND __@INSTALL_CMAKE_NAMESPACE@_message "\nVersion: ${version}") + endif() + if(components) + string(APPEND __@INSTALL_CMAKE_NAMESPACE@_message "\nComponents: ${components}") + endif() + set(@INSTALL_CMAKE_NAMESPACE@_DEPENDENCY_NOT_FOUND_MESSAGE + "${__@INSTALL_CMAKE_NAMESPACE@_message}") + return() + endif() +endforeach() |