[Cmake-commits] CMake branch, next, updated. v3.0.1-5263-g5c6635d

Brad King brad.king at kitware.com
Tue Sep 9 15:20:01 EDT 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  5c6635d90de331677ae75f436d82239e1496998b (commit)
       via  2131aeddaa6e9db8f9671bdee0358039fb570b4a (commit)
      from  621bd8816e011ac621d8db317b391be0e25d3045 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c6635d90de331677ae75f436d82239e1496998b
commit 5c6635d90de331677ae75f436d82239e1496998b
Merge: 621bd88 2131aed
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 9 15:20:00 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 9 15:20:00 2014 -0400

    Merge topic 'FindIce-updates' into next
    
    2131aedd FindIce: Respect Ice_FIND_QUIETLY when printing messages


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2131aeddaa6e9db8f9671bdee0358039fb570b4a
commit 2131aeddaa6e9db8f9671bdee0358039fb570b4a
Author:     Roger Leigh <rleigh at codelibre.net>
AuthorDate: Tue Sep 9 18:48:28 2014 +0000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 9 15:19:00 2014 -0400

    FindIce: Respect Ice_FIND_QUIETLY when printing messages

diff --git a/Modules/FindIce.cmake b/Modules/FindIce.cmake
index 50bc60e..60a4107 100644
--- a/Modules/FindIce.cmake
+++ b/Modules/FindIce.cmake
@@ -240,7 +240,9 @@ function(_Ice_FIND)
     set(Ice_VERSION "${Ice_VERSION_SLICE2CPP_FULL}" PARENT_SCOPE)
   endif()
 
-  message(STATUS "Ice version: ${Ice_VERSION_SLICE2CPP_FULL}")
+  if(NOT Ice_FIND_QUIETLY)
+    message(STATUS "Ice version: ${Ice_VERSION_SLICE2CPP_FULL}")
+  endif()
 
   # Find include directory
   find_path(Ice_INCLUDE_DIR
@@ -305,17 +307,19 @@ function(_Ice_FIND)
   set(_Ice_REQUIRED_LIBS_FOUND "${Ice_REQUIRED_LIBS_FOUND}" PARENT_SCOPE)
   set(Ice_LIBRARY "${Ice_LIBRARY}" PARENT_SCOPE)
 
-  if(Ice_LIBS_FOUND)
-    message(STATUS "Found the following Ice libraries:")
-    foreach(found ${Ice_LIBS_FOUND})
-      message(STATUS "  ${found}")
-    endforeach()
-  endif()
-  if(Ice_LIBS_NOTFOUND)
-    message(STATUS "The following Ice libraries were not found:")
-    foreach(notfound ${Ice_LIBS_NOTFOUND})
-      message(STATUS "  ${notfound}")
-    endforeach()
+  if(NOT Ice_FIND_QUIETLY)
+    if(Ice_LIBS_FOUND)
+      message(STATUS "Found the following Ice libraries:")
+      foreach(found ${Ice_LIBS_FOUND})
+        message(STATUS "  ${found}")
+      endforeach()
+    endif()
+    if(Ice_LIBS_NOTFOUND)
+      message(STATUS "The following Ice libraries were not found:")
+      foreach(notfound ${Ice_LIBS_NOTFOUND})
+        message(STATUS "  ${notfound}")
+      endforeach()
+    endif()
   endif()
 
   if(Ice_DEBUG)

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindIce.cmake |   28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list