fix catkin installation #478

BehaviorTree · Nov 27, 2022 · 234fdd0 · 234fdd0
1 parent 2692ff5
commit 234fdd0
Showing 1 changed file with 31 additions and 23 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -262,6 +262,7 @@ elseif(catkin_FOUND)
     set( BEHAVIOR_TREE_LIB_DESTINATION   ${CATKIN_PACKAGE_LIB_DESTINATION} )
     set( BEHAVIOR_TREE_INC_DESTINATION   ${CATKIN_GLOBAL_INCLUDE_DESTINATION} )
     set( BEHAVIOR_TREE_BIN_DESTINATION   ${CATKIN_GLOBAL_BIN_DESTINATION} )
+
 else()
     set( BEHAVIOR_TREE_LIB_DESTINATION   lib )
     set( BEHAVIOR_TREE_INC_DESTINATION   include )
@@ -288,34 +289,41 @@ INSTALL( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
     DESTINATION ${BEHAVIOR_TREE_INC_DESTINATION}
     FILES_MATCHING PATTERN "*.h*")
 
+if(catkin_FOUND)
+    INSTALL(TARGETS ${BEHAVIOR_TREE_LIBRARY}
+    ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+    LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+    RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
+    )
+else()
+    INSTALL(TARGETS ${BEHAVIOR_TREE_LIBRARY}
+        EXPORT ${PROJECT_NAME}Targets
+        ARCHIVE DESTINATION ${BEHAVIOR_TREE_LIB_DESTINATION}
+        LIBRARY DESTINATION ${BEHAVIOR_TREE_LIB_DESTINATION}
+        RUNTIME DESTINATION ${BEHAVIOR_TREE_BIN_DESTINATION}
+    )
 
-INSTALL(TARGETS ${BEHAVIOR_TREE_LIBRARY}
-    EXPORT ${PROJECT_NAME}Targets
-    ARCHIVE DESTINATION ${BEHAVIOR_TREE_LIB_DESTINATION}
-    LIBRARY DESTINATION ${BEHAVIOR_TREE_LIB_DESTINATION}
-    RUNTIME DESTINATION ${BEHAVIOR_TREE_BIN_DESTINATION}
-)
-
-install(EXPORT ${PROJECT_NAME}Targets
-    FILE "${PROJECT_NAME}Targets.cmake"
-    DESTINATION "${BEHAVIOR_TREE_LIB_DESTINATION}/cmake/${PROJECT_NAME}"
-    NAMESPACE BT::
-)
+    install(EXPORT ${PROJECT_NAME}Targets
+        FILE "${PROJECT_NAME}Targets.cmake"
+        DESTINATION "${BEHAVIOR_TREE_LIB_DESTINATION}/cmake/${PROJECT_NAME}"
+        NAMESPACE BT::
+    )
 
-install(FILES
-    "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
-    DESTINATION "${BEHAVIOR_TREE_LIB_DESTINATION}/cmake/${PROJECT_NAME}"
-)
+    install(FILES
+        "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+        DESTINATION "${BEHAVIOR_TREE_LIB_DESTINATION}/cmake/${PROJECT_NAME}"
+    )
 
-export(PACKAGE ${PROJECT_NAME})
+    export(PACKAGE ${PROJECT_NAME})
 
-include(CMakePackageConfigHelpers)
+    include(CMakePackageConfigHelpers)
 
-configure_package_config_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Config.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
-  INSTALL_DESTINATION "${BEHAVIOR_TREE_LIB_DESTINATION}/cmake/${PROJECT_NAME}"
-)
+    configure_package_config_file(
+        "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Config.cmake.in"
+        "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+        INSTALL_DESTINATION "${BEHAVIOR_TREE_LIB_DESTINATION}/cmake/${PROJECT_NAME}"
+    )
+endif()
 
 
 ######################################################