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/QtModuleToolsDependencies.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/QtModuleToolsDependencies.cmake.in')
-rw-r--r-- | cmake/QtModuleToolsDependencies.cmake.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmake/QtModuleToolsDependencies.cmake.in b/cmake/QtModuleToolsDependencies.cmake.in index d9ff04b6f9..46c60b8484 100644 --- a/cmake/QtModuleToolsDependencies.cmake.in +++ b/cmake/QtModuleToolsDependencies.cmake.in @@ -1,5 +1,4 @@ # Find "ModuleTools" dependencies, which are other ModuleTools packages. -set(@INSTALL_CMAKE_NAMESPACE@@target@_FOUND FALSE) set(_tool_deps "@package_deps@") foreach(_target_dep ${_tool_deps}) list(GET _target_dep 0 pkg) @@ -8,6 +7,10 @@ foreach(_target_dep ${_tool_deps}) if (NOT ${pkg}_FOUND) find_dependency(${pkg} ${version}) endif() + + if (NOT ${pkg}_FOUND) + set(@INSTALL_CMAKE_NAMESPACE@@target@_FOUND FALSE) + return() + endif() endforeach() -set(@INSTALL_CMAKE_NAMESPACE@@target@_FOUND TRUE) |