Skip to content

Commit 1fe05b1

Browse files
mintarmintar
authored
Merge pull request #191 from mintar/remove-ament-target-dependencies
[kilted] Update deprecated call to ament_target_dependencies
2 parents 72c826c + 7fd0e64 commit 1fe05b1

File tree

15 files changed

+144
-97
lines changed

15 files changed

+144
-97
lines changed

‎libphidget22/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ include(ExternalProject)
99
ExternalProject_Add(EP_${PROJECT_NAME}
1010
URL https://www.phidgets.com/downloads/phidget22/libraries/linux/libphidget22/libphidget22-1.19.20240304.tar.gz
1111
URL_MD5 9b059eaef8cb8ce70b8abd7e4d309d1d
12+
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
1213

1314
SOURCE_DIR ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-src
1415
CONFIGURE_COMMAND

‎phidgets_accelerometer/CMakeLists.txt‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ project(phidgets_accelerometer)
33

44
# Default to C++14
55
if(NOT CMAKE_CXX_STANDARD)
6-
set(CMAKE_CXX_STANDARD 14)
6+
set(CMAKE_CXX_STANDARD 17)
77
endif()
88

99
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -19,11 +19,14 @@ find_package(sensor_msgs REQUIRED)
1919
include_directories(include)
2020

2121
add_library(phidgets_accelerometer SHARED src/accelerometer_ros_i.cpp)
22-
ament_target_dependencies(phidgets_accelerometer
23-
phidgets_api
24-
rclcpp
25-
rclcpp_components
26-
sensor_msgs
22+
target_compile_features(phidgets_accelerometer PUBLIC cxx_std_17)
23+
target_link_libraries(phidgets_accelerometer PUBLIC
24+
${sensor_msgs_TARGETS}
25+
phidgets_api::phidgets_api
26+
rclcpp::rclcpp
27+
rclcpp_components::component
28+
rclcpp_components::component_manager
29+
sensor_msgs::sensor_msgs_library
2730
)
2831

2932
rclcpp_components_register_nodes(phidgets_accelerometer

‎phidgets_analog_inputs/CMakeLists.txt‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ project(phidgets_analog_inputs)
33

44
# Default to C++14
55
if(NOT CMAKE_CXX_STANDARD)
6-
set(CMAKE_CXX_STANDARD 14)
6+
set(CMAKE_CXX_STANDARD 17)
77
endif()
88

99
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -19,11 +19,13 @@ find_package(std_msgs REQUIRED)
1919
include_directories(include)
2020

2121
add_library(phidgets_analog_inputs SHARED src/analog_inputs_ros_i.cpp)
22-
ament_target_dependencies(phidgets_analog_inputs
23-
phidgets_api
24-
rclcpp
25-
rclcpp_components
26-
std_msgs
22+
target_compile_features(phidgets_analog_inputs PUBLIC cxx_std_17)
23+
target_link_libraries(phidgets_analog_inputs PUBLIC
24+
${std_msgs_TARGETS}
25+
phidgets_api::phidgets_api
26+
rclcpp::rclcpp
27+
rclcpp_components::component
28+
rclcpp_components::component_manager
2729
)
2830

2931
rclcpp_components_register_nodes(phidgets_analog_inputs

‎phidgets_analog_outputs/CMakeLists.txt‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ project(phidgets_analog_outputs)
33

44
# Default to C++14
55
if(NOT CMAKE_CXX_STANDARD)
6-
set(CMAKE_CXX_STANDARD 14)
6+
set(CMAKE_CXX_STANDARD 17)
77
endif()
88

99
# High level of warnings:
@@ -21,12 +21,14 @@ find_package(std_msgs REQUIRED)
2121
include_directories(include)
2222

2323
add_library(phidgets_analog_outputs src/analog_outputs_ros_i.cpp)
24-
ament_target_dependencies(phidgets_analog_outputs
25-
phidgets_api
26-
phidgets_msgs
27-
rclcpp
28-
rclcpp_components
29-
std_msgs
24+
target_compile_features(phidgets_analog_outputs PUBLIC cxx_std_17)
25+
target_link_libraries(phidgets_analog_outputs PUBLIC
26+
${phidgets_msgs_TARGETS}
27+
${std_msgs_TARGETS}
28+
phidgets_api::phidgets_api
29+
rclcpp::rclcpp
30+
rclcpp_components::component
31+
rclcpp_components::component_manager
3032
)
3133

3234
rclcpp_components_register_nodes(phidgets_analog_outputs

‎phidgets_api/CMakeLists.txt‎

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ project(phidgets_api)
44

55
# Default to C++14
66
if(NOT CMAKE_CXX_STANDARD)
7-
set(CMAKE_CXX_STANDARD 14)
7+
set(CMAKE_CXX_STANDARD 17)
88
endif()
99

1010
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -14,9 +14,8 @@ endif()
1414
find_package(ament_cmake_ros REQUIRED)
1515
find_package(libphidget22 REQUIRED)
1616

17-
include_directories(include)
18-
19-
add_library(phidgets_api src/accelerometer.cpp
17+
add_library(phidgets_api SHARED
18+
src/accelerometer.cpp
2019
src/analog_input.cpp
2120
src/analog_inputs.cpp
2221
src/analog_output.cpp
@@ -37,22 +36,39 @@ add_library(phidgets_api src/accelerometer.cpp
3736
src/stepper.cpp
3837
src/temperature.cpp)
3938

40-
ament_target_dependencies(phidgets_api
41-
libphidget22
39+
target_compile_features(phidgets_api PUBLIC cxx_std_17)
40+
41+
target_link_libraries(phidgets_api PUBLIC
42+
${libphidget22_LIBRARIES}
43+
)
44+
45+
target_include_directories(phidgets_api PUBLIC
46+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
47+
$<INSTALL_INTERFACE:include>
48+
${libphidget22_INCLUDE_DIRS}
4249
)
4350

44-
install(TARGETS phidgets_api
45-
ARCHIVE DESTINATION lib
46-
LIBRARY DESTINATION lib
47-
RUNTIME DESTINATION bin
51+
install(
52+
TARGETS phidgets_api
53+
EXPORT export_${PROJECT_NAME}
54+
ARCHIVE DESTINATION lib
55+
LIBRARY DESTINATION lib
56+
RUNTIME DESTINATION bin
4857
)
4958

50-
install(DIRECTORY include/
51-
DESTINATION include
59+
install(
60+
DIRECTORY include/
61+
DESTINATION include
5262
)
5363

54-
ament_export_dependencies(ament_cmake libphidget22)
64+
ament_export_dependencies(
65+
ament_cmake
66+
libphidget22
67+
)
5568
ament_export_include_directories(include)
5669
ament_export_libraries(phidgets_api)
70+
ament_export_targets(
71+
export_${PROJECT_NAME}
72+
)
5773

5874
ament_package()

‎phidgets_digital_inputs/CMakeLists.txt‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ project(phidgets_digital_inputs)
33

44
# Default to C++14
55
if(NOT CMAKE_CXX_STANDARD)
6-
set(CMAKE_CXX_STANDARD 14)
6+
set(CMAKE_CXX_STANDARD 17)
77
endif()
88

99
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -19,11 +19,13 @@ find_package(std_msgs REQUIRED)
1919
include_directories(include)
2020

2121
add_library(phidgets_digital_inputs SHARED src/digital_inputs_ros_i.cpp)
22-
ament_target_dependencies(phidgets_digital_inputs
23-
phidgets_api
24-
rclcpp
25-
rclcpp_components
26-
std_msgs
22+
target_compile_features(phidgets_digital_inputs PUBLIC cxx_std_17)
23+
target_link_libraries(phidgets_digital_inputs PUBLIC
24+
${std_msgs_TARGETS}
25+
phidgets_api::phidgets_api
26+
rclcpp::rclcpp
27+
rclcpp_components::component
28+
rclcpp_components::component_manager
2729
)
2830

2931
rclcpp_components_register_nodes(phidgets_digital_inputs

‎phidgets_digital_outputs/CMakeLists.txt‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ project(phidgets_digital_outputs)
33

44
# Default to C++14
55
if(NOT CMAKE_CXX_STANDARD)
6-
set(CMAKE_CXX_STANDARD 14)
6+
set(CMAKE_CXX_STANDARD 17)
77
endif()
88

99
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -20,12 +20,14 @@ find_package(std_msgs REQUIRED)
2020
include_directories(include)
2121

2222
add_library(phidgets_digital_outputs SHARED src/digital_outputs_ros_i.cpp)
23-
ament_target_dependencies(phidgets_digital_outputs
24-
phidgets_api
25-
phidgets_msgs
26-
rclcpp
27-
rclcpp_components
28-
std_msgs
23+
target_compile_features(phidgets_digital_outputs PUBLIC cxx_std_17)
24+
target_link_libraries(phidgets_digital_outputs PUBLIC
25+
${phidgets_msgs_TARGETS}
26+
${std_msgs_TARGETS}
27+
phidgets_api::phidgets_api
28+
rclcpp::rclcpp
29+
rclcpp_components::component
30+
rclcpp_components::component_manager
2931
)
3032

3133
rclcpp_components_register_nodes(phidgets_digital_outputs

‎phidgets_gyroscope/CMakeLists.txt‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ project(phidgets_gyroscope)
33

44
# Default to C++14
55
if(NOT CMAKE_CXX_STANDARD)
6-
set(CMAKE_CXX_STANDARD 14)
6+
set(CMAKE_CXX_STANDARD 17)
77
endif()
88

99
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -21,13 +21,16 @@ find_package(std_srvs REQUIRED)
2121
include_directories(include)
2222

2323
add_library(phidgets_gyroscope SHARED src/gyroscope_ros_i.cpp)
24-
ament_target_dependencies(phidgets_gyroscope
25-
phidgets_api
26-
rclcpp
27-
rclcpp_components
28-
sensor_msgs
29-
std_msgs
30-
std_srvs
24+
target_compile_features(phidgets_gyroscope PUBLIC cxx_std_17)
25+
target_link_libraries(phidgets_gyroscope PUBLIC
26+
${sensor_msgs_TARGETS}
27+
${std_msgs_TARGETS}
28+
${std_srvs_TARGETS}
29+
phidgets_api::phidgets_api
30+
rclcpp::rclcpp
31+
rclcpp_components::component
32+
rclcpp_components::component_manager
33+
sensor_msgs::sensor_msgs_library
3134
)
3235

3336
rclcpp_components_register_nodes(phidgets_gyroscope

‎phidgets_high_speed_encoder/CMakeLists.txt‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ project(phidgets_high_speed_encoder)
33

44
# Default to C++14
55
if(NOT CMAKE_CXX_STANDARD)
6-
set(CMAKE_CXX_STANDARD 14)
6+
set(CMAKE_CXX_STANDARD 17)
77
endif()
88

99
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -20,12 +20,15 @@ find_package(sensor_msgs REQUIRED)
2020
include_directories(include)
2121

2222
add_library(phidgets_high_speed_encoder SHARED src/high_speed_encoder_ros_i.cpp)
23-
ament_target_dependencies(phidgets_high_speed_encoder
24-
phidgets_api
25-
phidgets_msgs
26-
rclcpp
27-
rclcpp_components
28-
sensor_msgs
23+
target_compile_features(phidgets_high_speed_encoder PUBLIC cxx_std_17)
24+
target_link_libraries(phidgets_high_speed_encoder PUBLIC
25+
${phidgets_msgs_TARGETS}
26+
${sensor_msgs_TARGETS}
27+
phidgets_api::phidgets_api
28+
rclcpp::rclcpp
29+
rclcpp_components::component
30+
rclcpp_components::component_manager
31+
sensor_msgs::sensor_msgs_library
2932
)
3033

3134
rclcpp_components_register_nodes(phidgets_high_speed_encoder

‎phidgets_magnetometer/CMakeLists.txt‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ project(phidgets_magnetometer)
33

44
# Default to C++14
55
if(NOT CMAKE_CXX_STANDARD)
6-
set(CMAKE_CXX_STANDARD 14)
6+
set(CMAKE_CXX_STANDARD 17)
77
endif()
88

99
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -19,11 +19,14 @@ find_package(sensor_msgs REQUIRED)
1919
include_directories(include)
2020

2121
add_library(phidgets_magnetometer SHARED src/magnetometer_ros_i.cpp)
22-
ament_target_dependencies(phidgets_magnetometer
23-
phidgets_api
24-
rclcpp
25-
rclcpp_components
26-
sensor_msgs
22+
target_compile_features(phidgets_magnetometer PUBLIC cxx_std_17)
23+
target_link_libraries(phidgets_magnetometer PUBLIC
24+
${sensor_msgs_TARGETS}
25+
phidgets_api::phidgets_api
26+
rclcpp::rclcpp
27+
rclcpp_components::component
28+
rclcpp_components::component_manager
29+
sensor_msgs::sensor_msgs_library
2730
)
2831

2932
rclcpp_components_register_nodes(phidgets_magnetometer

0 commit comments

Comments
 (0)