From 75f465d3646e5deef2969a38c5492eb4e64518c7 Mon Sep 17 00:00:00 2001
From: "Michael X. Grey" <grey@osrfoundation.org>
Date: Thu, 3 Aug 2017 17:00:55 -0700
Subject: [PATCH 1/3] Protect dart-gui-osg and check more rigorously for the
 presence of OSG

---
 dart/gui/osg/CMakeLists.txt | 90 +++++++++++++++++++------------------
 1 file changed, 46 insertions(+), 44 deletions(-)

diff --git a/dart/gui/osg/CMakeLists.txt b/dart/gui/osg/CMakeLists.txt
index a76688fefe9ad..46e464340f23a 100644
--- a/dart/gui/osg/CMakeLists.txt
+++ b/dart/gui/osg/CMakeLists.txt
@@ -8,7 +8,7 @@ if(DART_BUILD_GUI_OSG)
 
   find_package(OpenSceneGraph 3.0 QUIET
     COMPONENTS osg osgViewer osgManipulator osgGA osgDB)
-  if(OPENSCENEGRAPH_FOUND)
+  if(OPENSCENEGRAPH_FOUND AND OSG_FOUND)
     if(DART_VERBOSE)
       message(STATUS "Looking for OpenSceneGraph - ${OPENSCENEGRAPH_VERSION} found")
     endif()
@@ -39,53 +39,55 @@ else()
 
 endif()
 
-# Search all header and source files
-file(GLOB hdrs "*.hpp")
-file(GLOB srcs "*.cpp")
+if(HAVE_OPENSCENEGRAPH)
+  # Search all header and source files
+  file(GLOB hdrs "*.hpp")
+  file(GLOB srcs "*.cpp")
 
-set(dart_gui_osg_hdrs ${hdrs})
-set(dart_gui_osg_srcs ${srcs})
+  set(dart_gui_osg_hdrs ${hdrs})
+  set(dart_gui_osg_srcs ${srcs})
 
-add_subdirectory(render)
+  add_subdirectory(render)
 
-# Set local target name
-set(target_name ${PROJECT_NAME}-gui-osg)
-set(component_name gui-osg)
+  # Set local target name
+  set(target_name ${PROJECT_NAME}-gui-osg)
+  set(component_name gui-osg)
 
-# Add target
-dart_add_library(${target_name} ${hdrs} ${srcs} ${dart_gui_osg_hdrs} ${dart_gui_osg_srcs})
-target_include_directories(
-  ${target_name} SYSTEM
-  PUBLIC ${OPENSCENEGRAPH_INCLUDE_DIRS}
-)
-target_link_libraries(
-  ${target_name}
-  dart-gui
-  ${OPENSCENEGRAPH_LIBRARIES}
-)
+  # Add target
+  dart_add_library(${target_name} ${hdrs} ${srcs} ${dart_gui_osg_hdrs} ${dart_gui_osg_srcs})
+  target_include_directories(
+    ${target_name} SYSTEM
+    PUBLIC ${OPENSCENEGRAPH_INCLUDE_DIRS}
+  )
+  target_link_libraries(
+    ${target_name}
+    dart-gui
+    ${OPENSCENEGRAPH_LIBRARIES}
+  )
 
-# Component
-add_component(${PROJECT_NAME} ${component_name})
-add_component_targets(${PROJECT_NAME} ${component_name} ${target_name})
-add_component_dependencies(${PROJECT_NAME} ${component_name} gui)
+  # Component
+  add_component(${PROJECT_NAME} ${component_name})
+  add_component_targets(${PROJECT_NAME} ${component_name} ${target_name})
+  add_component_dependencies(${PROJECT_NAME} ${component_name} gui)
 
-# Generate header for this namespace
-dart_get_filename_components(header_names "gui osg headers" ${hdrs})
-list(APPEND header_names "render/render.hpp")
-dart_generate_include_header_list(
-  gui_osg_headers
-  "dart/gui/osg/"
-  "gui osg headers"
-  ${header_names}
-)
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/osg.hpp.in
-  ${CMAKE_CURRENT_BINARY_DIR}/osg.hpp
-)
+  # Generate header for this namespace
+  dart_get_filename_components(header_names "gui osg headers" ${hdrs})
+  list(APPEND header_names "render/render.hpp")
+  dart_generate_include_header_list(
+    gui_osg_headers
+    "dart/gui/osg/"
+    "gui osg headers"
+    ${header_names}
+  )
+  configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/osg.hpp.in
+    ${CMAKE_CURRENT_BINARY_DIR}/osg.hpp
+  )
 
-# Install
-install(
-  FILES ${hdrs} ${CMAKE_CURRENT_BINARY_DIR}/osg.hpp
-  DESTINATION include/dart/gui/osg
-  COMPONENT headers
-)
+  # Install
+  install(
+    FILES ${hdrs} ${CMAKE_CURRENT_BINARY_DIR}/osg.hpp
+    DESTINATION include/dart/gui/osg
+    COMPONENT headers
+  )
+endif()

From d4d6fbbc7dfc1e105da78f89502c4099e210ba15 Mon Sep 17 00:00:00 2001
From: "Michael X. Grey" <grey@osrfoundation.org>
Date: Thu, 3 Aug 2017 17:15:19 -0700
Subject: [PATCH 2/3] Use return() instead of if-block

---
 dart/gui/osg/CMakeLists.txt | 93 ++++++++++++++++++-------------------
 1 file changed, 45 insertions(+), 48 deletions(-)

diff --git a/dart/gui/osg/CMakeLists.txt b/dart/gui/osg/CMakeLists.txt
index 46e464340f23a..c8f6b4e280092 100644
--- a/dart/gui/osg/CMakeLists.txt
+++ b/dart/gui/osg/CMakeLists.txt
@@ -12,7 +12,6 @@ if(DART_BUILD_GUI_OSG)
     if(DART_VERBOSE)
       message(STATUS "Looking for OpenSceneGraph - ${OPENSCENEGRAPH_VERSION} found")
     endif()
-    set(HAVE_OPENSCENEGRAPH TRUE)
   else()
     # dart-gui-osg requires both OSG and OpenThreads. This section attempts to
     # identify which of those are missing from the building machine and offer
@@ -29,65 +28,63 @@ if(DART_BUILD_GUI_OSG)
     endif()
     message(WARNING "${warning_msg} -- we will skip dart-gui-osg\n"
             "If you believe you do have both OSG and OpenThreads installed, try setting OSG_DIR")
-    set(HAVE_OPENSCENEGRAPH FALSE)
+    return()
   endif()
 
 else()
 
   message(STATUS "Skipping OpenSceneGraph (DART_BUILD_GUI_OSG == ${DART_BUILD_GUI_OSG})")
-  set(HAVE_OPENSCENEGRAPH FALSE)
+  return()
 
 endif()
 
-if(HAVE_OPENSCENEGRAPH)
-  # Search all header and source files
-  file(GLOB hdrs "*.hpp")
-  file(GLOB srcs "*.cpp")
+# Search all header and source files
+file(GLOB hdrs "*.hpp")
+file(GLOB srcs "*.cpp")
 
-  set(dart_gui_osg_hdrs ${hdrs})
-  set(dart_gui_osg_srcs ${srcs})
+set(dart_gui_osg_hdrs ${hdrs})
+set(dart_gui_osg_srcs ${srcs})
 
-  add_subdirectory(render)
+add_subdirectory(render)
 
-  # Set local target name
-  set(target_name ${PROJECT_NAME}-gui-osg)
-  set(component_name gui-osg)
+# Set local target name
+set(target_name ${PROJECT_NAME}-gui-osg)
+set(component_name gui-osg)
 
-  # Add target
-  dart_add_library(${target_name} ${hdrs} ${srcs} ${dart_gui_osg_hdrs} ${dart_gui_osg_srcs})
-  target_include_directories(
-    ${target_name} SYSTEM
-    PUBLIC ${OPENSCENEGRAPH_INCLUDE_DIRS}
-  )
-  target_link_libraries(
-    ${target_name}
-    dart-gui
-    ${OPENSCENEGRAPH_LIBRARIES}
-  )
+# Add target
+dart_add_library(${target_name} ${hdrs} ${srcs} ${dart_gui_osg_hdrs} ${dart_gui_osg_srcs})
+target_include_directories(
+  ${target_name} SYSTEM
+  PUBLIC ${OPENSCENEGRAPH_INCLUDE_DIRS}
+)
+target_link_libraries(
+  ${target_name}
+  dart-gui
+  ${OPENSCENEGRAPH_LIBRARIES}
+)
 
-  # Component
-  add_component(${PROJECT_NAME} ${component_name})
-  add_component_targets(${PROJECT_NAME} ${component_name} ${target_name})
-  add_component_dependencies(${PROJECT_NAME} ${component_name} gui)
+# Component
+add_component(${PROJECT_NAME} ${component_name})
+add_component_targets(${PROJECT_NAME} ${component_name} ${target_name})
+add_component_dependencies(${PROJECT_NAME} ${component_name} gui)
 
-  # Generate header for this namespace
-  dart_get_filename_components(header_names "gui osg headers" ${hdrs})
-  list(APPEND header_names "render/render.hpp")
-  dart_generate_include_header_list(
-    gui_osg_headers
-    "dart/gui/osg/"
-    "gui osg headers"
-    ${header_names}
-  )
-  configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/osg.hpp.in
-    ${CMAKE_CURRENT_BINARY_DIR}/osg.hpp
-  )
+# Generate header for this namespace
+dart_get_filename_components(header_names "gui osg headers" ${hdrs})
+list(APPEND header_names "render/render.hpp")
+dart_generate_include_header_list(
+  gui_osg_headers
+  "dart/gui/osg/"
+  "gui osg headers"
+  ${header_names}
+)
+configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/osg.hpp.in
+  ${CMAKE_CURRENT_BINARY_DIR}/osg.hpp
+)
 
-  # Install
-  install(
-    FILES ${hdrs} ${CMAKE_CURRENT_BINARY_DIR}/osg.hpp
-    DESTINATION include/dart/gui/osg
-    COMPONENT headers
-  )
-endif()
+# Install
+install(
+  FILES ${hdrs} ${CMAKE_CURRENT_BINARY_DIR}/osg.hpp
+  DESTINATION include/dart/gui/osg
+  COMPONENT headers
+)

From 51d3a047300b443e9ab610313b04ba1742bd91a4 Mon Sep 17 00:00:00 2001
From: "Michael X. Grey" <grey@osrfoundation.org>
Date: Mon, 7 Aug 2017 10:48:20 -0700
Subject: [PATCH 3/3] Adding comment about why we use OSG_FOUND

---
 dart/gui/osg/CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dart/gui/osg/CMakeLists.txt b/dart/gui/osg/CMakeLists.txt
index c8f6b4e280092..9d943f0d81772 100644
--- a/dart/gui/osg/CMakeLists.txt
+++ b/dart/gui/osg/CMakeLists.txt
@@ -8,6 +8,11 @@ if(DART_BUILD_GUI_OSG)
 
   find_package(OpenSceneGraph 3.0 QUIET
     COMPONENTS osg osgViewer osgManipulator osgGA osgDB)
+
+  # It seems that OPENSCENEGRAPH_FOUND will inadvertently get set to true when
+  # OpenThreads is found, even if OpenSceneGraph is not installed. This is quite
+  # possibly a bug in OSG's cmake configuration file. For now, it seems that
+  # requiring OSG_FOUND to be true as well fixes this.
   if(OPENSCENEGRAPH_FOUND AND OSG_FOUND)
     if(DART_VERBOSE)
       message(STATUS "Looking for OpenSceneGraph - ${OPENSCENEGRAPH_VERSION} found")