Skip to content

Commit 9d83c94

Browse files
berndpfrommerberndpfrommer
committed
avoid ament_target_dependencies
1 parent 2884501 commit 9d83c94

File tree

3 files changed

+37
-35
lines changed

3 files changed

+37
-35
lines changed

‎doc/index.rst

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,15 @@ Spinnaker camera driver
3131

3232
.. |driver_humble| image:: https://build.ros2.org/buildStatus/icon?job=Hbin_uJ64__spinnaker_camera_driver__ubuntu_jammy_amd64__binary&subject=Humble
3333
:target: https://build.ros2.org/job/Hbin_uJ64__spinnaker_camera_driver__ubuntu_jammy_amd64__binary/
34-
.. |driver_iron| image:: https://build.ros2.org/buildStatus/icon?job=Ibin_uJ64__spinnaker_camera_driver__ubuntu_jammy_amd64__binary&subject=Iron
35-
:target: https://build.ros2.org/job/Ibin_uJ64__spinnaker_camera_driver__ubuntu_jammy_amd64__binary/
3634
.. |driver_jazzy| image:: https://build.ros2.org/buildStatus/icon?job=Jbin_uN64__spinnaker_camera_driver__ubuntu_noble_amd64__binary&subject=Jazzy
3735
:target: https://build.ros2.org/job/Jbin_uN64__spinnaker_camera_driver__ubuntu_noble_amd64__binary/
36+
.. |driver_kilted| image:: https://build.ros2.org/buildStatus/icon?job=Kbin_uN64__spinnaker_camera_driver__ubuntu_noble_amd64__binary&subject=Kilted
37+
:target: https://build.ros2.org/job/Kbin_uN64__spinnaker_camera_driver__ubuntu_noble_amd64__binary/
3838
.. |driver_rolling| image:: https://build.ros2.org/buildStatus/icon?job=Rbin_uN64__spinnaker_camera_driver__ubuntu_noble_amd64__binary&subject=Rolling
3939
:target: https://build.ros2.org/job/Rbin_uN64__spinnaker_camera_driver__ubuntu_noble_amd64__binary/
4040

41+
42+
4143
Spinnaker synchronized camera driver
4244
------------------------------------
4345

@@ -51,10 +53,10 @@ Spinnaker synchronized camera driver
5153

5254
.. |sync_humble| image:: https://build.ros2.org/buildStatus/icon?job=Hbin_uJ64__spinnaker_synchronized_camera_driver__ubuntu_jammy_amd64__binary&subject=Humble
5355
:target: https://build.ros2.org/job/Hbin_uJ64__spinnaker_synchronized_camera_driver__ubuntu_jammy_amd64__binary/
54-
.. |sync_iron| image:: https://build.ros2.org/buildStatus/icon?job=Ibin_uJ64__spinnaker_synchronized_camera_driver__ubuntu_jammy_amd64__binary&subject=Iron
55-
:target: https://build.ros2.org/job/Ibin_uJ64__spinnaker_synchronized_camera_driver__ubuntu_jammy_amd64__binary/
5656
.. |sync_jazzy| image:: https://build.ros2.org/buildStatus/icon?job=Jbin_uN64__spinnaker_synchronized_camera_driver__ubuntu_noble_amd64__binary&subject=Jazzy
5757
:target: https://build.ros2.org/job/Jbin_uN64__spinnaker_synchronized_camera_driver__ubuntu_noble_amd64__binary/
58+
.. |sync_kilted| image:: https://build.ros2.org/buildStatus/icon?job=Kbin_uN64__spinnaker_synchronized_camera_driver__ubuntu_noble_amd64__binary&subject=Kilted
59+
:target: https://build.ros2.org/job/Kbin_uN64__spinnaker_synchronized_camera_driver__ubuntu_noble_amd64__binary/
5860
.. |sync_rolling| image:: https://build.ros2.org/buildStatus/icon?job=Rbin_uN64__spinnaker_synchronized_camera_driver__ubuntu_noble_amd64__binary&subject=Rolling
5961
:target: https://build.ros2.org/job/Rbin_uN64__spinnaker_synchronized_camera_driver__ubuntu_noble_amd64__binary/
6062

@@ -68,10 +70,10 @@ FLIR camera description
6870

6971
.. |desc_humble| image:: https://build.ros2.org/buildStatus/icon?job=Hbin_uJ64__flir_camera_description__ubuntu_jammy_amd64__binary&subject=Humble
7072
:target: https://build.ros2.org/job/Hbin_uJ64__flir_camera_description__ubuntu_jammy_amd64__binary/
71-
.. |desc_iron| image:: https://build.ros2.org/buildStatus/icon?job=Ibin_uJ64__flir_camera_description__ubuntu_jammy_amd64__binary&subject=Iron
72-
:target: https://build.ros2.org/job/Ibin_uJ64__flir_camera_description__ubuntu_jammy_amd64__binary/
7373
.. |desc_jazzy| image:: https://build.ros2.org/buildStatus/icon?job=Jbin_uN64__flir_camera_description__ubuntu_noble_amd64__binary&subject=Jazzy
7474
:target: https://build.ros2.org/job/Jbin_uN64__flir_camera_description__ubuntu_noble_amd64__binary/
75+
.. |desc_kilted| image:: https://build.ros2.org/buildStatus/icon?job=Kbin_uN64__flir_camera_description__ubuntu_noble_amd64__binary&subject=Kilted
76+
:target: https://build.ros2.org/job/Kbin_uN64__flir_camera_description__ubuntu_noble_amd64__binary/
7577
.. |desc_rolling| image:: https://build.ros2.org/buildStatus/icon?job=Rbin_uN64__flir_camera_description__ubuntu_noble_amd64__binary&subject=Rolling
7678
:target: https://build.ros2.org/job/Rbin_uN64__flir_camera_description__ubuntu_noble_amd64__binary/
7779

@@ -88,9 +90,9 @@ FLIR camera messages
8890

8991
.. |msg_humble| image:: https://build.ros2.org/buildStatus/icon?job=Hbin_uJ64__flir_camera_msgs__ubuntu_jammy_amd64__binary&subject=Humble
9092
:target: https://build.ros2.org/job/Hbin_uJ64__flir_camera_msgs__ubuntu_jammy_amd64__binary/
91-
.. |msg_iron| image:: https://build.ros2.org/buildStatus/icon?job=Ibin_uJ64__flir_camera_msgs__ubuntu_jammy_amd64__binary&subject=Iron
92-
:target: https://build.ros2.org/job/Ibin_uJ64__flir_camera_msgs__ubuntu_jammy_amd64__binary/
9393
.. |msg_jazzy| image:: https://build.ros2.org/buildStatus/icon?job=Jbin_uN64__flir_camera_msgs__ubuntu_noble_amd64__binary&subject=Jazzy
9494
:target: https://build.ros2.org/job/Jbin_uN64__flir_camera_msgs__ubuntu_noble_amd64__binary/
95+
.. |msg_kilted| image:: https://build.ros2.org/buildStatus/icon?job=Kbin_uN64__flir_camera_msgs__ubuntu_noble_amd64__binary&subject=Kilted
96+
:target: https://build.ros2.org/job/Kbin_uN64__flir_camera_msgs__ubuntu_noble_amd64__binary/
9597
.. |msg_rolling| image:: https://build.ros2.org/buildStatus/icon?job=Rbin_uN64__flir_camera_msgs__ubuntu_noble_amd64__binary&subject=Rolling
9698
:target: https://build.ros2.org/job/Rbin_uN64__flir_camera_msgs__ubuntu_noble_amd64__binary/

‎spinnaker_camera_driver/CMakeLists.txt

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -64,29 +64,30 @@ message(STATUS "libSpinnaker library location: ${SPINNAKER_LIBRARIES}")
6464
message(STATUS "libSpinnaker include location: ${SPINNAKER_INCLUDE_DIRS}")
6565

6666
find_package(SPINNAKER REQUIRED)
67+
find_package(ament_cmake REQUIRED)
68+
find_package(ament_cmake_ros REQUIRED)
69+
find_package(camera_info_manager REQUIRED)
70+
find_package(flir_camera_msgs REQUIRED)
71+
find_package(image_transport REQUIRED)
72+
find_package(rclcpp REQUIRED)
73+
find_package(rclcpp_components REQUIRED)
74+
find_package(sensor_msgs REQUIRED)
75+
find_package(std_msgs REQUIRED)
76+
find_package(yaml-cpp REQUIRED)
6777

6878
include_directories(SYSTEM
6979
${SPINNAKER_INCLUDE_DIRS})
7080

7181
# list of all packages that use ament for export (may work for others too)
7282

7383
set(ROS_DEPENDENCIES
74-
"rclcpp"
75-
"rclcpp_components"
76-
"sensor_msgs"
77-
"std_msgs"
78-
"camera_info_manager"
79-
"image_transport"
80-
"flir_camera_msgs")
81-
82-
# find dependencies
83-
find_package(ament_cmake REQUIRED)
84-
find_package(ament_cmake_ros REQUIRED)
85-
86-
foreach(pkg ${ROS_DEPENDENCIES})
87-
find_package(${pkg} REQUIRED)
88-
endforeach()
89-
find_package(yaml-cpp REQUIRED)
84+
camera_info_manager::camera_info_manager
85+
${flir_camera_msgs_TARGETS}
86+
image_transport::image_transport
87+
rclcpp::rclcpp
88+
rclcpp_components::component
89+
${sensor_msgs_TARGETS}
90+
${std_msgs_TARGETS})
9091

9192
#
9293
# shared library for composable node
@@ -102,9 +103,9 @@ add_library(camera_driver SHARED
102103
src/genicam_utils.cpp
103104
)
104105

105-
ament_target_dependencies(camera_driver PUBLIC ${ROS_DEPENDENCIES})
106106
target_link_libraries(camera_driver
107107
PUBLIC
108+
${ROS_DEPENDENCIES}
108109
yaml-cpp
109110
PRIVATE
110111
Spinnaker::Spinnaker)

‎spinnaker_synchronized_camera_driver/CMakeLists.txt

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,17 @@ if(NOT CMAKE_BUILD_TYPE)
3434
endif()
3535

3636
find_package(spinnaker_camera_driver REQUIRED)
37-
3837
# list of all packages that use ament for export (may work for others too)
3938

40-
set(ROS_DEPENDENCIES
41-
"rclcpp"
42-
"rclcpp_components")
43-
4439
# find dependencies
4540
find_package(ament_cmake REQUIRED)
4641
find_package(ament_cmake_ros REQUIRED)
42+
find_package(rclcpp REQUIRED)
43+
find_package(rclcpp_components REQUIRED)
4744

48-
foreach(pkg ${ROS_DEPENDENCIES})
49-
find_package(${pkg} REQUIRED)
50-
endforeach()
45+
set(ROS_DEPENDENCIES
46+
rclcpp::rclcpp
47+
rclcpp_components::component)
5148

5249
#
5350
# shared library for composable node
@@ -63,8 +60,10 @@ add_library(synchronized_camera_driver SHARED
6360
src/master_exposure_controller.cpp
6461
src/follower_exposure_controller.cpp)
6562

66-
ament_target_dependencies(synchronized_camera_driver PUBLIC ${ROS_DEPENDENCIES})
67-
target_link_libraries(synchronized_camera_driver PUBLIC spinnaker_camera_driver::camera_driver PRIVATE yaml-cpp)
63+
target_link_libraries(synchronized_camera_driver
64+
PUBLIC
65+
spinnaker_camera_driver::camera_driver ${ROS_DEPENDENCIES}
66+
PRIVATE yaml-cpp)
6867

6968
target_include_directories(synchronized_camera_driver
7069
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>

0 commit comments

Comments
 (0)