Set LIBRARY_OUTPUT_PATH if catkin found, not if undefined

jhu-saw · Feb 11, 2015 · 52d307b · 52d307b
1 parent e38cea6
commit 52d307b
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
@@ -23,9 +23,13 @@ if (cisst_FOUND_AS_REQUIRED)
   # load cisst configuration
   include (${CISST_USE_FILE})
 
-  # where to save the libraries
-  if (NOT DEFINED LIBRARY_OUTPUT_PATH)
+  # catkin/ROS paths
+  cisst_is_catkin_build (sawTextToSpeech_IS_CATKIN_BUILT)
+  if (sawTextToSpeech_IS_CATKIN_BUILT)
+    set (sawTextToSpeech_CONFIG_FILE_DIR "${CATKIN_DEVEL_PREFIX}/cmake")
     set (LIBRARY_OUTPUT_PATH "${sawTextToSpeech_BINARY_DIR}/lib")
+  else ()
+    set (sawTextToSpeech_CONFIG_FILE_DIR "${sawTextToSpeech_BINARY_DIR}")
   endif ()
 
   # create/configure file for find_package (sawTextToSpeech)
@@ -55,13 +59,6 @@ if (cisst_FOUND_AS_REQUIRED)
   set_property (TARGET sawTextToSpeech PROPERTY FOLDER "sawTextToSpeech")
   cisst_target_link_libraries (sawTextToSpeech ${REQUIRED_CISST_LIBRARIES})
 
-  cisst_is_catkin_build (sawTextToSpeech_IS_CATKIN_BUILT)
-  if (sawTextToSpeech_IS_CATKIN_BUILT)
-    set (sawTextToSpeech_CONFIG_FILE_DIR "${CATKIN_DEVEL_PREFIX}/cmake")
-  else ()
-    set (sawTextToSpeech_CONFIG_FILE_DIR "${sawTextToSpeech_BINARY_DIR}")
-  endif ()
-
   configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/sawTextToSpeechConfig.cmake.in"
                   "${sawTextToSpeech_CONFIG_FILE_DIR}/sawTextToSpeechConfig.cmake"
                    @ONLY@)