aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Neundorf <neundorf@kde.org>2008-12-08 22:39:27 +0000
committerAlexander Neundorf <neundorf@kde.org>2008-12-08 22:39:27 +0000
commitf9248c8938c2ee4e31cb2ea8565c6350757dbae2 (patch)
tree8f3294a2e1c94b4e7f3ef7526da6486053362fde
parent7285826cedf2c374655242c8f64e432256dd1ecc (diff)
downloadextra-cmake-modules-f9248c8938c2ee4e31cb2ea8565c6350757dbae2.tar.gz
extra-cmake-modules-f9248c8938c2ee4e31cb2ea8565c6350757dbae2.tar.bz2
-make finding the FooConfig.cmake file quiet, but don't make the outer FindFoo.cmake file quiet
Alex svn path=/trunk/KDE/kdelibs/; revision=894602
-rw-r--r--modules/FindAutomoc4.cmake2
-rw-r--r--modules/FindStrigi.cmake4
2 files changed, 5 insertions, 1 deletions
diff --git a/modules/FindAutomoc4.cmake b/modules/FindAutomoc4.cmake
index c76d20b8..1192ea01 100644
--- a/modules/FindAutomoc4.cmake
+++ b/modules/FindAutomoc4.cmake
@@ -25,7 +25,9 @@ else("${KDESupport_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
# when building this project outside kdesupport
# use the new "config-mode" of cmake 2.6, which searches the installed Automoc4Config.cmake file
# see the man page for details
+ set(_Automoc4_FIND_QUIETLY ${Automoc4_FIND_QUIETLY})
find_package(Automoc4 QUIET NO_MODULE)
+ set(Automoc4_FIND_QUIETLY ${_Automoc4_FIND_QUIETLY})
endif("${KDESupport_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
include(FindPackageHandleStandardArgs)
diff --git a/modules/FindStrigi.cmake b/modules/FindStrigi.cmake
index 52a9aa66..372cea8b 100644
--- a/modules/FindStrigi.cmake
+++ b/modules/FindStrigi.cmake
@@ -14,8 +14,10 @@ endif(NOT STRIGI_MIN_VERSION)
file(TO_CMAKE_PATH "$ENV{STRIGI_HOME}" strigi_home)
+set(_Strigi_FIND_QUIETLY ${Strigi_FIND_QUIETLY})
# Try to find and load the StrigiConfig.cmake installed by kdesupport/strigi
-find_package(Strigi NO_MODULE PATHS "${strigi_home}/lib/strigi" "${strigi_home}/lib64/strigi")
+find_package(Strigi QUIET NO_MODULE PATHS "${strigi_home}/lib/strigi" "${strigi_home}/lib64/strigi")
+set(Strigi_FIND_QUIETLY ${_Strigi_FIND_QUIETLY})
# If StrigiConfig.cmake (installed by kdesupport/Strigi) has been found
# and it contains all necessary information (since November 16th, 2008), use the information