Skip to content

Fix ament_target_dependencies removal #98

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
David-LP99 wants to merge 1 commit into
base: rolling
Choose a base branch
from
+128 −75
Open

Fix ament_target_dependencies removal #98

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
2 changes: 1 addition & 1 deletion rclc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

project(micro_ros_demos_rclc)

Expand Down
6 changes: 4 additions & 2 deletions rclc/addtwoints_client/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

project(addtwoints_client LANGUAGES C)

Expand All @@ -9,7 +9,9 @@ find_package(example_interfaces REQUIRED)

add_executable(${PROJECT_NAME} main.c)

ament_target_dependencies(${PROJECT_NAME}
include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/ament_target_dependencies_compat.cmake)

ament_target_dependencies_compat(${PROJECT_NAME}
rcl
rclc
example_interfaces
Expand Down
6 changes: 4 additions & 2 deletions rclc/addtwoints_server/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

project(addtwoints_server LANGUAGES C)

Expand All @@ -9,7 +9,9 @@ find_package(example_interfaces REQUIRED)

add_executable(${PROJECT_NAME} main.c)

ament_target_dependencies(${PROJECT_NAME}
include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/ament_target_dependencies_compat.cmake)

ament_target_dependencies_compat(${PROJECT_NAME}
rcl
rclc
example_interfaces
Expand Down
10 changes: 3 additions & 7 deletions rclc/autodiscover_agent/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

project(autodiscover_agent LANGUAGES C)

Expand All @@ -8,21 +8,17 @@ find_package(rclc REQUIRED)
find_package(std_msgs REQUIRED)
find_package(microxrcedds_client REQUIRED)
find_package(rmw_microxrcedds REQUIRED)
find_package(microxrcedds_client REQUIRED)

add_executable(${PROJECT_NAME} main.c)

target_link_libraries(${PROJECT_NAME}
microxrcedds_client
)
include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/ament_target_dependencies_compat.cmake)

ament_target_dependencies(${PROJECT_NAME}
ament_target_dependencies_compat(${PROJECT_NAME}
rcl
rclc
std_msgs
microxrcedds_client
rmw_microxrcedds
microxrcedds_client
)

install(TARGETS ${PROJECT_NAME}
Expand Down
19 changes: 19 additions & 0 deletions rclc/cmake/ament_target_dependencies_compat.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# ament_cmake no longer provides ament_target_dependencies(). This links each
# named dependency's modern imported target if it exists, falling back to the
# classic <dep>_INCLUDE_DIRS / <dep>_LIBRARIES variables otherwise.
macro(ament_target_dependencies_compat _target)
foreach(_dep ${ARGN})
if(TARGET ${_dep}::${_dep})
target_link_libraries(${_target} ${_dep}::${_dep})
elseif(TARGET ${_dep})
target_link_libraries(${_target} ${_dep})
else()
if(${_dep}_INCLUDE_DIRS)
target_include_directories(${_target} PUBLIC ${${_dep}_INCLUDE_DIRS})
endif()
if(${_dep}_LIBRARIES)
target_link_libraries(${_target} ${${_dep}_LIBRARIES})
endif()
endif()
endforeach()
endmacro()
6 changes: 4 additions & 2 deletions rclc/complex_msg_publisher/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

project(complex_msg_publisher LANGUAGES C)

Expand All @@ -10,7 +10,9 @@ find_package(rmw_microxrcedds REQUIRED)

add_executable(${PROJECT_NAME} main.c)

ament_target_dependencies(${PROJECT_NAME}
include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/ament_target_dependencies_compat.cmake)

ament_target_dependencies_compat(${PROJECT_NAME}
rcl
rclc
complex_msgs
Expand Down
7 changes: 4 additions & 3 deletions rclc/complex_msg_subscriber/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

project(complex_msg_subscriber LANGUAGES C)

Expand All @@ -10,7 +10,9 @@ find_package(rmw_microxrcedds REQUIRED)

add_executable(${PROJECT_NAME} main.c)

ament_target_dependencies(${PROJECT_NAME}
include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/ament_target_dependencies_compat.cmake)

ament_target_dependencies_compat(${PROJECT_NAME}
rcl
rclc
complex_msgs
Expand All @@ -20,4 +22,3 @@ ament_target_dependencies(${PROJECT_NAME}
install(TARGETS ${PROJECT_NAME}
DESTINATION ${PROJECT_NAME}
)

9 changes: 3 additions & 6 deletions rclc/configuration_example/configured_publisher/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

project(configured_publisher LANGUAGES C)

Expand All @@ -11,11 +11,9 @@ find_package(rmw_microxrcedds REQUIRED)

add_executable(${PROJECT_NAME} main.c)

target_link_libraries(${PROJECT_NAME}
microxrcedds_client
)
include(${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/ament_target_dependencies_compat.cmake)

ament_target_dependencies(${PROJECT_NAME}
ament_target_dependencies_compat(${PROJECT_NAME}
rcl
rclc
std_msgs
Expand All @@ -26,4 +24,3 @@ ament_target_dependencies(${PROJECT_NAME}
install(TARGETS ${PROJECT_NAME}
DESTINATION ${PROJECT_NAME}
)

9 changes: 3 additions & 6 deletions rclc/configuration_example/configured_subscriber/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

project(configured_subscriber LANGUAGES C)

Expand All @@ -11,11 +11,9 @@ find_package(microxrcedds_client REQUIRED)

add_executable(${PROJECT_NAME} main.c)

target_link_libraries(${PROJECT_NAME}
microxrcedds_client
)
include(${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/ament_target_dependencies_compat.cmake)

ament_target_dependencies(${PROJECT_NAME}
ament_target_dependencies_compat(${PROJECT_NAME}
rcl
rclc
std_msgs
Expand All @@ -26,4 +24,3 @@ ament_target_dependencies(${PROJECT_NAME}
install(TARGETS ${PROJECT_NAME}
DESTINATION ${PROJECT_NAME}
)

9 changes: 3 additions & 6 deletions rclc/configuration_example/custom_transports/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

project(custom_transports LANGUAGES C)

Expand All @@ -11,11 +11,9 @@ find_package(microxrcedds_client REQUIRED)

add_executable(${PROJECT_NAME} main.c)

target_link_libraries(${PROJECT_NAME}
microxrcedds_client
)
include(${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/ament_target_dependencies_compat.cmake)

ament_target_dependencies(${PROJECT_NAME}
ament_target_dependencies_compat(${PROJECT_NAME}
rcl
rclc
std_msgs
Expand All @@ -33,4 +31,3 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
install(TARGETS ${PROJECT_NAME}
DESTINATION ${PROJECT_NAME}
)

6 changes: 4 additions & 2 deletions rclc/epoch_synchronization/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

project(epoch_synchronization LANGUAGES C)

Expand All @@ -10,7 +10,9 @@ find_package(rmw_microxrcedds REQUIRED)

add_executable(${PROJECT_NAME} main.c)

ament_target_dependencies(${PROJECT_NAME}
include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/ament_target_dependencies_compat.cmake)

ament_target_dependencies_compat(${PROJECT_NAME}
rcl
rclc
std_msgs
Expand Down
6 changes: 4 additions & 2 deletions rclc/fibonacci_action_client/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

project(fibonacci_action_client LANGUAGES C)

Expand All @@ -11,7 +11,9 @@ find_package(Threads REQUIRED)
add_executable(${PROJECT_NAME} main.c)
target_link_libraries(${PROJECT_NAME} Threads::Threads)

ament_target_dependencies(${PROJECT_NAME}
include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/ament_target_dependencies_compat.cmake)

ament_target_dependencies_compat(${PROJECT_NAME}
rcl
rclc
example_interfaces
Expand Down
6 changes: 4 additions & 2 deletions rclc/fibonacci_action_server/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

project(fibonacci_action_server LANGUAGES C)

Expand All @@ -11,7 +11,9 @@ find_package(Threads REQUIRED)
add_executable(${PROJECT_NAME} main.c)
target_link_libraries(${PROJECT_NAME} Threads::Threads)

ament_target_dependencies(${PROJECT_NAME}
include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/ament_target_dependencies_compat.cmake)

ament_target_dependencies_compat(${PROJECT_NAME}
rcl
rclc
example_interfaces
Expand Down
6 changes: 4 additions & 2 deletions rclc/fragmented_publication/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

project(fragmented_publication LANGUAGES C)

Expand All @@ -10,7 +10,9 @@ find_package(rmw_microxrcedds REQUIRED)

add_executable(${PROJECT_NAME} main.c)

ament_target_dependencies(${PROJECT_NAME}
include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/ament_target_dependencies_compat.cmake)

ament_target_dependencies_compat(${PROJECT_NAME}
rcl
rclc
std_msgs
Expand Down
6 changes: 4 additions & 2 deletions rclc/fragmented_subscription/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

project(fragmented_subscription LANGUAGES C)

Expand All @@ -10,7 +10,9 @@ find_package(rmw_microxrcedds REQUIRED)

add_executable(${PROJECT_NAME} main.c)

ament_target_dependencies(${PROJECT_NAME}
include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/ament_target_dependencies_compat.cmake)

ament_target_dependencies_compat(${PROJECT_NAME}
rcl
rclc
std_msgs
Expand Down
6 changes: 4 additions & 2 deletions rclc/graph_introspection/graph_visualizer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

project(graph_visualizer LANGUAGES C)

Expand All @@ -10,7 +10,9 @@ find_package(rmw_microxrcedds REQUIRED)

add_executable(${PROJECT_NAME} main.c)

ament_target_dependencies(${PROJECT_NAME}
include(${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/ament_target_dependencies_compat.cmake)

ament_target_dependencies_compat(${PROJECT_NAME}
rcl
rclc
std_msgs
Expand Down
6 changes: 4 additions & 2 deletions rclc/graph_introspection/publisher_count/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

project(publisher_count LANGUAGES C)

Expand All @@ -10,7 +10,9 @@ find_package(rmw_microxrcedds REQUIRED)

add_executable(${PROJECT_NAME} main.c)

ament_target_dependencies(${PROJECT_NAME}
include(${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/ament_target_dependencies_compat.cmake)

ament_target_dependencies_compat(${PROJECT_NAME}
rcl
rclc
rcl_interfaces
Expand Down
6 changes: 4 additions & 2 deletions rclc/graph_introspection/subscription_count/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

project(subscription_count LANGUAGES C)

Expand All @@ -10,7 +10,9 @@ find_package(rmw_microxrcedds REQUIRED)

add_executable(${PROJECT_NAME} main.c)

ament_target_dependencies(${PROJECT_NAME}
include(${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/ament_target_dependencies_compat.cmake)

ament_target_dependencies_compat(${PROJECT_NAME}
rcl
rclc
rcl_interfaces
Expand Down
6 changes: 4 additions & 2 deletions rclc/int32_multinode/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

project(int32_multinode LANGUAGES C)

Expand All @@ -9,7 +9,9 @@ find_package(std_msgs REQUIRED)

add_executable(${PROJECT_NAME} main.c)

ament_target_dependencies(${PROJECT_NAME}
include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/ament_target_dependencies_compat.cmake)

ament_target_dependencies_compat(${PROJECT_NAME}
rcl
rclc
std_msgs
Expand Down
6 changes: 4 additions & 2 deletions rclc/int32_publisher/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

project(int32_publisher LANGUAGES C)

Expand All @@ -10,7 +10,9 @@ find_package(rmw_microxrcedds REQUIRED)

add_executable(${PROJECT_NAME} main.c)

ament_target_dependencies(${PROJECT_NAME}
include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/ament_target_dependencies_compat.cmake)

ament_target_dependencies_compat(${PROJECT_NAME}
rcl
rclc
std_msgs
Expand Down
6 changes: 4 additions & 2 deletions rclc/int32_publisher_subscriber/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

project(int32_publisher_subscriber LANGUAGES C)

Expand All @@ -10,7 +10,9 @@ find_package(rmw_microxrcedds REQUIRED)

add_executable(${PROJECT_NAME} main.c)

ament_target_dependencies(${PROJECT_NAME}
include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/ament_target_dependencies_compat.cmake)

ament_target_dependencies_compat(${PROJECT_NAME}
rcl
rclc
std_msgs
Expand Down
Loading
Loading