Преглед изворни кода

FindOpenSceneGraph: Do not add unfound OSG libs if not required

Mattias Helsing пре 11 година
родитељ
комит
b683da3efa
1 измењених фајлова са 5 додато и 2 уклоњено
  1. 5 2
      Modules/FindOpenSceneGraph.cmake

+ 5 - 2
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})