@@ -49,7 +49,6 @@ if(BTCPP_ENABLE_COROUTINES)
4949 add_definitions (-DBT_BOOST_COROUTINE)
5050 set (BT_COROUTINES_FOUND true )
5151 endif ()
52- include_directories (${Boost_INCLUDE_DIRS} )
5352 endif ()
5453
5554 if (NOT DEFINED BT_COROUTINES_FOUND)
@@ -222,27 +221,23 @@ target_link_libraries(${BEHAVIOR_TREE_LIBRARY}
222221 PUBLIC
223222 ${BEHAVIOR_TREE_PUBLIC_LIBRARIES}
224223 PRIVATE
225- ${Boost_LIBRARIES}
226- ${ZMQ_LIBRARIES}
224+ $<BUILD_INTERFACE:Boost::coroutine>
225+ $<BUILD_INTERFACE: $ {ZMQ_LIBRARIES}>
227226 $<BUILD_INTERFACE:foonathan::lexy>
228227)
229228
230- #get_target_property(my_libs ${BEHAVIOR_TREE_LIBRARY} INTERFACE_LINK_LIBRARIES)
231- #list(REMOVE_ITEM _libs X)
232- #message("my_libs: ${my_libs}")
233-
234- #set_target_properties(${BEHAVIOR_TREE_LIBRARY} PROPERTIES INTERFACE_LINK_LIBRARIES "")
235-
236229target_compile_definitions (${BEHAVIOR_TREE_LIBRARY} PRIVATE $<$<CONFIG:Debug>:TINYXML2_DEBUG>)
237230
238231target_include_directories (${BEHAVIOR_TREE_LIBRARY} PUBLIC
239232 $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR} /include >
240233 $<INSTALL_INTERFACE:include >
241- ${BUILD_TOOL_INCLUDE_DIRS} )
234+ )
242235
243236target_include_directories (${BEHAVIOR_TREE_LIBRARY} PRIVATE
244237 $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR} /3rdparty>
245238 $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR} /3rdparty/lexy/include >
239+ $<BUILD_INTERFACE:${BUILD_TOOL_INCLUDE_DIRS} >
240+ $<BUILD_INTERFACE:${Boost_INCLUDE_DIRS} >
246241 )
247242
248243if ( ZMQ_FOUND )
@@ -258,7 +253,13 @@ endif()
258253#############################################################
259254if (ament_cmake_FOUND)
260255 find_package (ament_index_cpp REQUIRED)
261- ament_target_dependencies(${BEHAVIOR_TREE_LIBRARY} PUBLIC ament_index_cpp)
256+
257+ target_include_directories (${BEHAVIOR_TREE_LIBRARY} PRIVATE
258+ $<BUILD_INTERFACE:${ament_index_cpp_INCLUDE_DIRS} > )
259+
260+ target_link_libraries (${BEHAVIOR_TREE_LIBRARY} PRIVATE
261+ $<BUILD_INTERFACE:ament_index_cpp::ament_index_cpp> )
262+
262263 ament_export_dependencies(ament_index_cpp)
263264
264265 set ( BEHAVIOR_TREE_LIB_DESTINATION lib )
@@ -321,14 +322,6 @@ configure_package_config_file(
321322 INSTALL_DESTINATION "${BEHAVIOR_TREE_LIB_DESTINATION} /cmake/${PROJECT_NAME} "
322323)
323324
324- # This requires to declare to project version in the project() macro
325-
326- #write_basic_package_version_file(
327- # "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
328- # VERSION ${PROJECT_VERSION}
329- # COMPATIBILITY AnyNewerVersion
330- #)
331-
332325install (
333326 FILES
334327 "${CMAKE_CURRENT_BINARY_DIR} /${PROJECT_NAME} Config.cmake"
0 commit comments