diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-09-14 09:06:58 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-09-14 15:03:13 +0200 |
| commit | b9c493728aa9f73b6876c6bef0ebd9f07824f553 (patch) | |
| tree | e0ffb8557d5650159b3d45b223acdf2a799c6371 /cmake/QtModuleToolsDependencies.cmake.in | |
| parent | 721116de309f1933fad788fe4272c0d5c12b9909 (diff) | |
Revert "Revert "CMake: Fix usage of find_dependency()""
...and fix the build errors the original change caused.
This reverts commit 127fb8bb5587db52216d0ac934f3111170a7cbe3.
Change-Id: I4006b32734a51c5d101dd73c957f81d2a0f84ba1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtModuleToolsDependencies.cmake.in')
| -rw-r--r-- | cmake/QtModuleToolsDependencies.cmake.in | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cmake/QtModuleToolsDependencies.cmake.in b/cmake/QtModuleToolsDependencies.cmake.in index 46c60b8484..d9ff04b6f9 100644 --- a/cmake/QtModuleToolsDependencies.cmake.in +++ b/cmake/QtModuleToolsDependencies.cmake.in @@ -1,4 +1,5 @@ # 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) @@ -7,10 +8,6 @@ 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) |