@@ -49,7 +49,6 @@ if(BTCPP_ENABLE_COROUTINES)
49
49
add_definitions (-DBT_BOOST_COROUTINE )
50
50
set (BT_COROUTINES_FOUND true )
51
51
endif ()
52
- include_directories (${Boost_INCLUDE_DIRS} )
53
52
endif ()
54
53
55
54
if (NOT DEFINED BT_COROUTINES_FOUND )
@@ -222,27 +221,23 @@ target_link_libraries(${BEHAVIOR_TREE_LIBRARY}
222
221
PUBLIC
223
222
${BEHAVIOR_TREE_PUBLIC_LIBRARIES}
224
223
PRIVATE
225
- ${Boost_LIBRARIES}
226
- ${ZMQ_LIBRARIES}
224
+ $< BUILD_INTERFACE:Boost::coroutine >
225
+ $< BUILD_INTERFACE: $ {ZMQ_LIBRARIES}>
227
226
$< BUILD_INTERFACE:foonathan::lexy>
228
227
)
229
228
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
-
236
229
target_compile_definitions (${BEHAVIOR_TREE_LIBRARY} PRIVATE $< $< CONFIG:Debug> :TINYXML2_DEBUG> )
237
230
238
231
target_include_directories (${BEHAVIOR_TREE_LIBRARY} PUBLIC
239
232
$< BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR} /include>
240
233
$< INSTALL_INTERFACE:include>
241
- ${BUILD_TOOL_INCLUDE_DIRS} )
234
+ )
242
235
243
236
target_include_directories (${BEHAVIOR_TREE_LIBRARY} PRIVATE
244
237
$< BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR} /3rdparty>
245
238
$< BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR} /3rdparty/lexy/include>
239
+ $< BUILD_INTERFACE:${BUILD_TOOL_INCLUDE_DIRS} >
240
+ $< BUILD_INTERFACE:${Boost_INCLUDE_DIRS} >
246
241
)
247
242
248
243
if ( ZMQ_FOUND )
@@ -258,7 +253,13 @@ endif()
258
253
#############################################################
259
254
if (ament_cmake_FOUND )
260
255
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
+
262
263
ament_export_dependencies (ament_index_cpp )
263
264
264
265
set ( BEHAVIOR_TREE_LIB_DESTINATION lib )
@@ -321,14 +322,6 @@ configure_package_config_file(
321
322
INSTALL_DESTINATION "${BEHAVIOR_TREE_LIB_DESTINATION} /cmake/${PROJECT_NAME} "
322
323
)
323
324
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
-
332
325
install (
333
326
FILES
334
327
"${CMAKE_CURRENT_BINARY_DIR} /${PROJECT_NAME} Config.cmake"
0 commit comments