Skip to content

Replace ament_target_dependencies with target_link_libraries #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ahcorde wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace ament_target_dependencies with target_link_libraries #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions micro_ros_common_diagnostics/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ add_executable(hwmonitor src/hwmonitor.c)
target_include_directories(hwmonitor PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>)
ament_target_dependencies(hwmonitor
"micro_ros_diagnostic_updater"
"micro_ros_diagnostic_msgs"
"rclc"
"rcutils"
target_link_libraries(hwmonitor
micro_ros_diagnostic_updater::micro_ros_diagnostic_updater
${micro_ros_diagnostic_msgs_TARGETS}
rclc::rclc
rcutils::rcutils
)

install(TARGETS hwmonitor
Expand Down
16 changes: 8 additions & 8 deletions micro_ros_diagnostic_bridge/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ target_include_directories(diagnostic_bridge
PRIVATE
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>
)
ament_target_dependencies(diagnostic_bridge
rclcpp
diagnostic_msgs
micro_ros_diagnostic_msgs
target_link_libraries(diagnostic_bridge
rclcpp::rclcpp
${diagnostic_msgs_TARGETS}
${micro_ros_diagnostic_msgs_TARGETS}
)
install(TARGETS diagnostic_bridge
DESTINATION lib/${PROJECT_NAME})
Expand Down Expand Up @@ -83,10 +83,10 @@ if(BUILD_TESTING)
${rclcpp_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
)
ament_target_dependencies(test_diagnostic_bridge
"rclcpp"
"diagnostic_msgs"
"micro_ros_diagnostic_msgs")
target_link_libraries(test_diagnostic_bridge
rclcpp::rclcpp
${diagnostic_msgs_TARGETS}
${micro_ros_diagnostic_msgs_TARGETS})
endif()
endif()

Expand Down
63 changes: 33 additions & 30 deletions micro_ros_diagnostic_updater/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ target_include_directories(${PROJECT_NAME}
PRIVATE
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>
)
ament_target_dependencies(${PROJECT_NAME}
rclc
rcutils
micro_ros_diagnostic_msgs
target_link_libraries(${PROJECT_NAME} PUBLIC
rclc::rclc
rcutils::rcutils
${micro_ros_diagnostic_msgs_TARGETS}
)

# Create source files with the define
Expand All @@ -62,11 +62,12 @@ if(MICRO_ROS_DIAGNOSTIC_UPDATER_EXAMPLES)

set(processor_example example_processor_updater)
add_executable(${processor_example} example/example_processor_updater.c)
target_link_libraries(${processor_example} ${PROJECT_NAME})
ament_target_dependencies(${processor_example}
rclc
rcutils
micro_ros_diagnostic_msgs)
target_link_libraries(${processor_example}
${PROJECT_NAME}
rclc::rclc
rcutils::rcutils
${micro_ros_diagnostic_msgs_TARGETS}
)

install(TARGETS
${processor_example}
Expand All @@ -75,11 +76,12 @@ if(MICRO_ROS_DIAGNOSTIC_UPDATER_EXAMPLES)

set(website_example example_website_checker)
add_executable(${website_example} example/example_website_checker.c)
target_link_libraries(${website_example} ${PROJECT_NAME})
ament_target_dependencies(${website_example}
rclc
rcutils
micro_ros_diagnostic_msgs)
target_link_libraries(${website_example}
${PROJECT_NAME}
rclc::rclc
rcutils::rcutils
${micro_ros_diagnostic_msgs_TARGETS}
)

install(TARGETS
${website_example}
Expand All @@ -89,7 +91,7 @@ endif()

# Install
install(DIRECTORY include/ DESTINATION include)
install(TARGETS ${PROJECT_NAME} DESTINATION lib)
install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME} DESTINATION lib)

# Install config.h file.
install(
Expand All @@ -99,9 +101,13 @@ install(
include/${PROJECT_NAME}
)

# Export old-style CMake variables
ament_export_include_directories(include)
ament_export_libraries(${PROJECT_NAME})

# Export modern CMake targets
ament_export_targets(${PROJECT_NAME})

if(BUILD_TESTING)
find_package(ament_cmake_gtest REQUIRED)
find_package(ament_lint_auto REQUIRED)
Expand All @@ -115,22 +121,19 @@ if(BUILD_TESTING)
test/test_diagnostic_updater.cpp)

target_include_directories(${PROJECT_NAME}_test PRIVATE include src)
target_link_libraries(${PROJECT_NAME}_test ${PROJECT_NAME})
ament_target_dependencies(${PROJECT_NAME}_test
rcl
rclc
micro_ros_diagnostic_msgs
target_link_libraries(${PROJECT_NAME}_test
${PROJECT_NAME}
rcl::rcl
rclc::rclc
${micro_ros_diagnostic_msgs_TARGETS}
)
endif()

# export dependencies
# specific order: dependents before dependencies
ament_export_include_directories(include)
ament_export_libraries(${PROJECT_NAME})
ament_export_dependencies(ament_cmake)
ament_export_dependencies(micro_ros_diagnostic_msgs)
ament_export_dependencies(rosidl_generator_c)
ament_export_dependencies(rcl)
ament_export_dependencies(rclc)
ament_export_dependencies(rcutils)
ament_export_dependencies(
micro_ros_diagnostic_msgs
rosidl_generator_c
rcl
rclc
rcutils
)
ament_package()