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>

1 files changed, 15 insertions, 9 deletions

diff --git a/cmake/QtPluginDependencies.cmake.in b/cmake/QtPluginDependencies.cmake.in
index ce64b096bb..eb1d9c3433 100644
--- a/cmake/QtPluginDependencies.cmake.in
+++ b/cmake/QtPluginDependencies.cmake.in
@@ -1,5 +1,3 @@
-set(@target@_FOUND FALSE)
-
 # note: _third_party_deps example: "ICU\\;1.0\\;i18n uc data;ZLIB\\;\\;"
 set(_third_party_deps "@third_party_deps@")
 
@@ -12,11 +10,16 @@ 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})
+        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()
     endif()
 endforeach()
 
@@ -31,6 +34,9 @@ foreach(_target_dep ${_target_deps})
             PATHS @find_dependency_paths@ ${QT_EXAMPLES_CMAKE_PREFIX_PATH} NO_DEFAULT_PATH
         )
     endif()
-endforeach()
 
-set(@target@_FOUND TRUE)
+    if (NOT ${pkg}_FOUND)
+        set(@target@_FOUND FALSE)
+        return()
+    endif()
+endforeach()