merge pull request BehaviorTree#14 related to BehaviorTree#10 (with some minor changes)

Davide Faconti · Davide Faconti · commit ca08cabf77a9 · 2018-11-19T09:54:38.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -105,15 +105,29 @@ list(APPEND BT_SOURCE
 set(BEHAVIOR_TREE_LIBRARY ${PROJECT_NAME})
 
 add_library(${BEHAVIOR_TREE_LIBRARY} ${BT_SOURCE} )
-target_link_libraries(${BEHAVIOR_TREE_LIBRARY}  ${BEHAVIOR_TREE_EXTERNAL_LIBRARIES} ${catkin_LIBRARIES})
-target_include_directories(${BEHAVIOR_TREE_LIBRARY} PUBLIC include 3rdparty ${catkin_INCLUDE_DIRS})
+target_link_libraries(${BEHAVIOR_TREE_LIBRARY} PUBLIC ${BEHAVIOR_TREE_EXTERNAL_LIBRARIES} ${catkin_LIBRARIES})
+target_include_directories(${BEHAVIOR_TREE_LIBRARY} PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+    $<INSTALL_INTERFACE:include>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/3rdparty>
+    $<INSTALL_INTERFACE:3rdparty>
+    ${catkin_INCLUDE_DIRS})
 
 if(MSVC)
   target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE /W4 /WX)
 else()
   target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE -Wall -Wextra -Werror=return-type)
 endif()
 
+######################################################
+# EXPORTS
+
+set(PROJECT_NAMESPACE BehaviorTree)
+set(PROJECT_CONFIG ${PROJECT_NAMESPACE}Config)
+export(TARGETS ${PROJECT_NAME}
+       NAMESPACE ${PROJECT_NAMESPACE}::
+       FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_CONFIG}.cmake")
+
 ######################################################
 # TESTS
 
@@ -154,23 +168,32 @@ endif()
 # INSTALL
 if(catkin_FOUND)
     set( BEHAVIOR_TREE_LIB_DESTINATION   ${CATKIN_PACKAGE_LIB_DESTINATION} )
-    set( BEHAVIOR_TREE_INC_DESTINATION   ${CATKIN_GLOBAL_INCLUDE_DESTINATION} )
+    set( BEHAVIOR_TREE_INC_DESTINATION   ${CATKIN_PACKAGE_INCLUDE_DESTINATION} )
     set( BEHAVIOR_TREE_BIN_DESTINATION   ${CATKIN_PACKAGE_BIN_DESTINATION} )
 else()
     set( BEHAVIOR_TREE_LIB_DESTINATION   lib )
     set( BEHAVIOR_TREE_INC_DESTINATION   include )
     set( BEHAVIOR_TREE_BIN_DESTINATION   bin )
 endif()
 
+message(STATUS "BEHAVIOR_TREE_LIB_DESTINATION: ${BEHAVIOR_TREE_LIB_DESTINATION}")
+message(STATUS "BEHAVIOR_TREE_INC_DESTINATION: ${BEHAVIOR_TREE_INC_DESTINATION}")
+message(STATUS "BEHAVIOR_TREE_BIN_DESTINATION: ${BEHAVIOR_TREE_BIN_DESTINATION}")
+
 INSTALL(TARGETS ${BEHAVIOR_TREE_LIBRARY}
+    EXPORT ${PROJECT_CONFIG}
     ARCHIVE DESTINATION ${BEHAVIOR_TREE_LIB_DESTINATION}
     LIBRARY DESTINATION ${BEHAVIOR_TREE_LIB_DESTINATION}
     )
 
-INSTALL( DIRECTORY ${CMAKE_SOURCE_DIR}/include/
+INSTALL( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
     DESTINATION ${BEHAVIOR_TREE_INC_DESTINATION}
     FILES_MATCHING PATTERN "*.h*")
 
+install(EXPORT ${PROJECT_CONFIG}
+    DESTINATION "${BEHAVIOR_TREE_LIB_DESTINATION}/${PROJECT_NAMESPACE}/cmake"
+    NAMESPACE ${PROJECT_NAMESPACE}::)
+
 ######################################################
 # EXAMPLES and TOOLS
 
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -4,19 +4,19 @@ cmake_minimum_required(VERSION 2.8)
 add_executable(bt_log_cat         bt_log_cat.cpp )
 target_link_libraries(bt_log_cat  ${BEHAVIOR_TREE_LIBRARY} )
 install(TARGETS bt_log_cat
-    DESTINATION ${BEHAVIOR_TREE_BIN_DESTINATION} )
+        DESTINATION ${BEHAVIOR_TREE_BIN_DESTINATION} )
 
 if( ZMQ_FOUND )
     add_executable(bt_recorder         bt_recorder.cpp )
     target_link_libraries(bt_recorder  ${BEHAVIOR_TREE_LIBRARY} )
     install(TARGETS bt_recorder
-        DESTINATION ${BEHAVIOR_TREE_BIN_DESTINATION} )
+            DESTINATION ${BEHAVIOR_TREE_BIN_DESTINATION} )
 endif()
 
 add_executable(bt_plugin_manifest         bt_plugin_manifest.cpp )
 target_link_libraries(bt_plugin_manifest  ${BEHAVIOR_TREE_LIBRARY} )
 install(TARGETS bt_plugin_manifest
-    DESTINATION ${BEHAVIOR_TREE_BIN_DESTINATION} )
+        DESTINATION ${BEHAVIOR_TREE_BIN_DESTINATION} )
 
 
 
