Use return() instead of if-block

dartsim · Aug 4, 2017 · d4d6fbb · d4d6fbb
1 parent 75f465d
commit d4d6fbb
Showing 1 changed file with 45 additions and 48 deletions.
diff --git 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
+)