Skip to content

Commit 9ed45e9

Browse files
committed
fix for humble
1 parent 70aa7c9 commit 9ed45e9

File tree

1 file changed

+18
-10
lines changed

1 file changed

+18
-10
lines changed

CMakeLists.txt

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,23 @@ find_package(behaviortree_cpp REQUIRED )
1818
find_package(ament_index_cpp REQUIRED)
1919
find_package(rosidl_default_generators REQUIRED)
2020

21-
add_library(bt_ros2 src/bt_ros2.cpp)
22-
target_include_directories(bt_ros2 PRIVATE
21+
add_library(${PROJECT_NAME} src/bt_ros2.cpp)
22+
target_include_directories(${PROJECT_NAME} PRIVATE
2323
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
24-
ament_target_dependencies(bt_ros2 ${THIS_PACKAGE_INCLUDE_DEPENDS})
24+
ament_target_dependencies(${PROJECT_NAME} ${THIS_PACKAGE_INCLUDE_DEPENDS})
2525

2626
######################################################
27-
rosidl_generate_interfaces(${PROJECT_NAME}
27+
rosidl_generate_interfaces(${PROJECT_NAME}_SLEEP
2828
"action/Sleep.action")
2929

3030
# macro to remove some boiler plate
3131
function(add_target_dependencies target)
3232
target_include_directories(${target} PRIVATE
3333
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
3434
ament_target_dependencies(${target} ${THIS_PACKAGE_INCLUDE_DEPENDS})
35-
rosidl_target_interfaces(${target} ${PROJECT_NAME} "rosidl_typesupport_cpp")
35+
36+
rosidl_get_typesupport_target(cpp_typesupport_target "${PROJECT_NAME}_SLEEP" "rosidl_typesupport_cpp")
37+
target_link_libraries(${target} "${cpp_typesupport_target}")
3638
endfunction()
3739

3840
######################################################
@@ -76,14 +78,20 @@ install(TARGETS
7678
)
7779

7880
install(
79-
DIRECTORY include/
80-
DESTINATION include
81-
)
81+
TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}
82+
ARCHIVE DESTINATION lib
83+
LIBRARY DESTINATION lib
84+
RUNTIME DESTINATION bin)
85+
86+
install(DIRECTORY include/ DESTINATION include/${PROJECT_NAME})
87+
8288

8389
ament_export_include_directories(include)
8490

85-
ament_export_dependencies(behaviortree_cpp rosidl_default_runtime)
91+
ament_export_libraries(${PROJECT_NAME})
8692

87-
ament_package()
93+
ament_export_targets(${PROJECT_NAME})
8894

95+
ament_export_dependencies(behaviortree_cpp rclcpp_action rclcpp)
8996

97+
ament_package()

0 commit comments

Comments
 (0)