From 6e1a570dc8560489d10120cbd019a665f33f49c2 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Sun, 13 Sep 2020 12:16:34 +0200 Subject: Revert "CMake: Reduce the number of find_dependency calls" This reverts commit a3cb002511d7e2cc73234611795c1947620aedd5. This lead to configuration errors on some machines, blocking development. Change-Id: Ibb785c96c7d85692a6e22a73e086119eb571df71 Reviewed-by: Lars Knoll --- cmake/QtModuleDependencies.cmake.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'cmake/QtModuleDependencies.cmake.in') diff --git a/cmake/QtModuleDependencies.cmake.in b/cmake/QtModuleDependencies.cmake.in index 3d19fac784..80c5202c9a 100644 --- a/cmake/QtModuleDependencies.cmake.in +++ b/cmake/QtModuleDependencies.cmake.in @@ -15,12 +15,13 @@ foreach(_target_dep ${_third_party_deps}) if(version) list(APPEND find_package_args "${version}") endif() + if(components) string(REPLACE " " ";" components "${components}") - list(APPEND find_package_args COMPONENTS ${components}) + find_dependency(${find_package_args} COMPONENTS ${components}) + else() + find_dependency(${find_package_args}) endif() - - find_dependency(${find_package_args}) endforeach() # Find Qt tool package. -- cgit v1.2.3