diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-09-11 13:41:39 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-09-12 19:26:52 +0200 |
commit | 58c1c6ee5c986d502b56eb1cc57f1d9444d42031 (patch) | |
tree | 19689d29d176e78ee7fb0fcc3f77b3b225d6baca /cmake/QtModuleToolsDependencies.cmake.in | |
parent | 55687924e3cc40b1ffc5a9038bb7e37d1ed6a19c (diff) |
CMake: Fix usage of find_dependency()
The find_dependency() macro calls return() on failure, meaning any code
after it will be ignored, thus checking any XXX_FOUND variables after
find_dependency() is pointless.
Fix the places where we use find_dependency() and set the "failed" state
before the call and the "success" state afterwards.
Change-Id: Ia5239c704f02a9bec972210374ffed7808b14055
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) |