[Cmake-commits] CMake branch, next, updated. v2.8.7-2862-gf64b412

Rolf Eike Beer eike at sf-mail.de
Fri Feb 24 14:39:13 EST 2012


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  f64b412344a1a0e4cbf3c87bb4a87c6e72882615 (commit)
       via  ffdaa4761c4dee10af1ec096ecfc72af7cdff827 (commit)
      from  f0728dd9e2b1fc85a653c124c7245881d79f865f (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=f64b412344a1a0e4cbf3c87bb4a87c6e72882615
commit f64b412344a1a0e4cbf3c87bb4a87c6e72882615
Merge: f0728dd ffdaa47
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Feb 24 14:39:10 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 24 14:39:10 2012 -0500

    Merge topic 'improve-findopenscenegraph' into next
    
    ffdaa47 FindOpenSceneGraph: give every message() with an explicit level


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ffdaa4761c4dee10af1ec096ecfc72af7cdff827
commit ffdaa4761c4dee10af1ec096ecfc72af7cdff827
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Feb 24 20:39:01 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Feb 24 20:39:01 2012 +0100

    FindOpenSceneGraph: give every message() with an explicit level

diff --git a/Modules/FindOpenSceneGraph.cmake b/Modules/FindOpenSceneGraph.cmake
index 460f0fd..52f9316 100644
--- a/Modules/FindOpenSceneGraph.cmake
+++ b/Modules/FindOpenSceneGraph.cmake
@@ -78,7 +78,7 @@ list(APPEND _osg_modules_to_process "osg" "OpenThreads")
 list(REMOVE_DUPLICATES _osg_modules_to_process)
 
 if(OpenSceneGraph_DEBUG)
-    message("[ FindOpenSceneGraph.cmake:${CMAKE_CURRENT_LIST_LINE} ] "
+    message(STATUS "[ FindOpenSceneGraph.cmake:${CMAKE_CURRENT_LIST_LINE} ] "
         "Components = ${_osg_modules_to_process}")
 endif()
 
@@ -93,7 +93,7 @@ endif()
 # Try to ascertain the version...
 if(OSG_INCLUDE_DIR)
     if(OpenSceneGraph_DEBUG)
-        message("[ FindOpenSceneGraph.cmake:${CMAKE_CURRENT_LIST_LINE} ] "
+        message(STATUS "[ FindOpenSceneGraph.cmake:${CMAKE_CURRENT_LIST_LINE} ] "
             "Detected OSG_INCLUDE_DIR = ${OSG_INCLUDE_DIR}")
     endif()
     
@@ -127,14 +127,14 @@ if(OSG_INCLUDE_DIR)
         string(REGEX REPLACE ".*#define OPENSCENEGRAPH_PATCH_VERSION[ \t]+([0-9]+).*"
             "\\1" _osg_VERSION_PATCH ${_osg_Version_contents})
     else()
-        message("[ FindOpenSceneGraph.cmake:${CMAKE_CURRENT_LIST_LINE} ] "
+        message(WARNING "[ FindOpenSceneGraph.cmake:${CMAKE_CURRENT_LIST_LINE} ] "
             "Failed to parse version number, please report this as a bug")
     endif()
 
     set(OPENSCENEGRAPH_VERSION "${_osg_VERSION_MAJOR}.${_osg_VERSION_MINOR}.${_osg_VERSION_PATCH}"
                                 CACHE INTERNAL "The version of OSG which was detected")
     if(OpenSceneGraph_DEBUG)
-        message("[ FindOpenSceneGraph.cmake:${CMAKE_CURRENT_LIST_LINE} ] "
+        message(STATUS "[ FindOpenSceneGraph.cmake:${CMAKE_CURRENT_LIST_LINE} ] "
             "Detected version ${OPENSCENEGRAPH_VERSION}")
     endif()
 endif()
@@ -165,7 +165,7 @@ endif()
 #
 foreach(_osg_module ${_osg_modules_to_process})
     if(OpenSceneGraph_DEBUG)
-        message("[ FindOpenSceneGraph.cmake:${CMAKE_CURRENT_LIST_LINE} ] "
+        message(STATUS "[ FindOpenSceneGraph.cmake:${CMAKE_CURRENT_LIST_LINE} ] "
             "Calling find_package(${_osg_module} ${_osg_required} ${_osg_quiet})")
     endif()
     find_package(${_osg_module} ${_osg_quiet})

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

Summary of changes:
 Modules/FindOpenSceneGraph.cmake |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list