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/QtPluginDependencies.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/QtPluginDependencies.cmake.in')
-rw-r--r-- | cmake/QtPluginDependencies.cmake.in | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/cmake/QtPluginDependencies.cmake.in b/cmake/QtPluginDependencies.cmake.in index eb1d9c3433..ce64b096bb 100644 --- a/cmake/QtPluginDependencies.cmake.in +++ b/cmake/QtPluginDependencies.cmake.in @@ -1,3 +1,5 @@ +set(@target@_FOUND FALSE) + # note: _third_party_deps example: "ICU\\;1.0\\;i18n uc data;ZLIB\\;\\;" set(_third_party_deps "@third_party_deps@") @@ -10,16 +12,11 @@ foreach(_target_dep ${_third_party_deps}) list(APPEND find_package_args "${version}") endif() - if(components) - string(REPLACE " " ";" components "${components}") - find_dependency(${find_package_args} COMPONENTS ${components}) - else() - find_dependency(${find_package_args}) - endif() - - if (NOT ${pkg}_FOUND) - set(@target@_FOUND FALSE) - return() + if(components) + string(REPLACE " " ";" components "${components}") + find_dependency(${find_package_args} COMPONENTS ${components}) + else() + find_dependency(${find_package_args}) endif() endforeach() @@ -34,9 +31,6 @@ foreach(_target_dep ${_target_deps}) PATHS @find_dependency_paths@ ${QT_EXAMPLES_CMAKE_PREFIX_PATH} NO_DEFAULT_PATH ) endif() - - if (NOT ${pkg}_FOUND) - set(@target@_FOUND FALSE) - return() - endif() endforeach() + +set(@target@_FOUND TRUE) |