From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Fri, 27 Apr 2012 14:40:55 +0000 (+0200)
Subject: Forward the REQUIRED and QUIET arguments when finding dependencies.
X-Git-Tag: 071012110112~1334
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7fc8edf069c6fd01caa75185071c941cf1f688bc;p=profile%2Fivi%2Fqtbase.git

Forward the REQUIRED and QUIET arguments when finding dependencies.

Change-Id: I5d7c26f12a296ac3527575149978b18c5e9a4a67
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
---

diff --git a/mkspecs/cmake/Qt5BasicConfig.cmake.in b/mkspecs/cmake/Qt5BasicConfig.cmake.in
index a04d2b4..fa62b3e 100644
--- a/mkspecs/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/cmake/Qt5BasicConfig.cmake.in
@@ -19,9 +19,18 @@ set(Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS QT_\${_CMAKE_MODULE_NAME_UPPER}
 
 set(_Qt5_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\")
 
+set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED)
+if (Qt5$${CMAKE_MODULE_NAME}_FIND_REQUIRED)
+    set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED)
+endif()
+set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET)
+if (Qt5$${CMAKE_MODULE_NAME}_FIND_QUIETLY)
+    set(_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET QUIET)
+endif()
+
 foreach(_module_dep ${_Qt5_MODULE_DEPENDENCIES})
     if (NOT Qt5${_module_dep}_FOUND)
-        find_package(Qt5${_module_dep} REQUIRED)
+        find_package(Qt5${_module_dep} ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET} ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED})
     endif()
     list(APPEND Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS ${Qt5${_module_dep}_INCLUDE_DIRS})
     list(APPEND Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS ${Qt5${_module_dep}_DEFINITIONS})