[Cmake-commits] CMake branch, next, updated. v3.0.2-5374-g33324d9

[Brad King]

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  33324d93216496079ec12a9f11f35faada8f988c (commit)
       via  b683da3efa4873c4e51339935f7c7ea67c15e246 (commit)
       via  201cc6fe095f1a0abfc34bb6482d933cc12ff055 (commit)
       via  7b11f87100f07d0c504da0720387f0c7f818fb3e (commit)
      from  e1dd61c444949a5433a4ac768e1f67ae70225eaa (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=33324d93216496079ec12a9f11f35faada8f988c
commit 33324d93216496079ec12a9f11f35faada8f988c
Merge: e1dd61c b683da3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 18 09:13:10 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 18 09:13:10 2014 -0400

    Merge topic 'FindOpenSceneGraph-pieces-not-found' into next
    
    b683da3e FindOpenSceneGraph: Do not add unfound OSG libs if not required
    201cc6fe CMake Nightly Date Stamp
    7b11f871 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b683da3efa4873c4e51339935f7c7ea67c15e246
commit b683da3efa4873c4e51339935f7c7ea67c15e246
Author:     Mattias Helsing <helsing72 at gmail.com>
AuthorDate: Tue Sep 16 22:20:19 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 18 09:06:58 2014 -0400

    FindOpenSceneGraph: Do not add unfound OSG libs if not required

diff --git a/Modules/FindOpenSceneGraph.cmake b/Modules/FindOpenSceneGraph.cmake
index 7bbd753..68adff7 100644
--- a/Modules/FindOpenSceneGraph.cmake
+++ b/Modules/FindOpenSceneGraph.cmake
@@ -203,8 +203,11 @@ foreach(_osg_module ${_osg_modules_to_process})
     find_package(${_osg_module} ${_osg_quiet})
 
     string(TOUPPER ${_osg_module} _osg_module_UC)
-    list(APPEND OPENSCENEGRAPH_INCLUDE_DIR ${${_osg_module_UC}_INCLUDE_DIR})
-    list(APPEND OPENSCENEGRAPH_LIBRARIES ${${_osg_module_UC}_LIBRARIES})
+    # append to list if module was found OR is required
+    if( ${_osg_module_UC}_FOUND OR OpenSceneGraph_FIND_REQUIRED )
+      list(APPEND OPENSCENEGRAPH_INCLUDE_DIR ${${_osg_module_UC}_INCLUDE_DIR})
+      list(APPEND OPENSCENEGRAPH_LIBRARIES ${${_osg_module_UC}_LIBRARIES})
+    endif()
 
     if(OpenSceneGraph_MARK_AS_ADVANCED)
         OSG_MARK_AS_ADVANCED(${_osg_module})

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

Summary of changes:
 Modules/FindOpenSceneGraph.cmake |    7 +++++--
 Source/CMakeVersion.cmake        |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake