Skip to content

Commit b131097

Browse files
mini-1235mini-1235
committed
Fix as requested
Signed-off-by: mini-1235 <[email protected]>
1 parent 818c87d commit b131097

File tree

13 files changed

+18
-21
lines changed

13 files changed

+18
-21
lines changed

‎controller_interface/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ set(THIS_PACKAGE_INCLUDE_DEPENDS
99
hardware_interface
1010
rclcpp_lifecycle
1111
realtime_tools
12+
fmt
1213
)
1314

1415
find_package(ament_cmake REQUIRED)

‎controller_interface/package.xml

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<build_depend>realtime_tools</build_depend>
1919
<build_depend>ros2_control_cmake</build_depend>
2020
<build_depend>sensor_msgs</build_depend>
21+
<build_depend>fmt</build_depend>
2122

2223
<build_export_depend>hardware_interface</build_export_depend>
2324
<build_export_depend>realtime_tools</build_export_depend>

‎controller_manager/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ set(THIS_PACKAGE_INCLUDE_DEPENDS
1616
std_msgs
1717
libstatistics_collector
1818
generate_parameter_library
19+
fmt
1920
)
2021

2122
find_package(ament_cmake REQUIRED)

‎controller_manager/package.xml

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<depend>std_msgs</depend>
3333
<depend>libstatistics_collector</depend>
3434
<depend>generate_parameter_library</depend>
35+
<depend>fmt</depend>
3536

3637
<test_depend>ament_cmake_gmock</test_depend>
3738
<test_depend>ament_cmake_pytest</test_depend>

‎controller_manager/src/controller_manager.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ void ControllerManager::init_resource_manager(const std::string & robot_descript
670670
{
671671
throw std::runtime_error(
672672
fmt::format(
673-
FMT_COMPILE("Failed to set the initial state of the component : %s to %s"),
673+
FMT_COMPILE("Failed to set the initial state of the component : {} to {}"),
674674
component.c_str(), state.label()));
675675
}
676676
components_to_activate.erase(component);
@@ -706,7 +706,7 @@ void ControllerManager::init_resource_manager(const std::string & robot_descript
706706
{
707707
throw std::runtime_error(
708708
fmt::format(
709-
FMT_COMPILE("Failed to set the initial state of the component : %s to %s"),
709+
FMT_COMPILE("Failed to set the initial state of the component : {} to {}"),
710710
component.c_str(), active_state.label()));
711711
}
712712
}

‎hardware_interface/CMakeLists.txt

+6-7
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ target_include_directories(hardware_interface PUBLIC
4141
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
4242
$<INSTALL_INTERFACE:include/hardware_interface>
4343
)
44-
target_link_libraries(hardware_interface PRIVATE fmt::fmt)
4544
ament_target_dependencies(hardware_interface PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS})
4645

4746
add_library(mock_components SHARED
@@ -72,16 +71,16 @@ if(BUILD_TESTING)
7271
ament_target_dependencies(test_inst_hardwares rcpputils)
7372

7473
ament_add_gmock(test_joint_handle test/test_handle.cpp)
75-
target_link_libraries(test_joint_handle hardware_interface fmt::fmt)
76-
ament_target_dependencies(test_joint_handle rcpputils fmt)
74+
target_link_libraries(test_joint_handle hardware_interface)
75+
ament_target_dependencies(test_joint_handle rcpputils)
7776

7877
ament_add_gmock(test_component_interfaces test/test_component_interfaces.cpp)
79-
target_link_libraries(test_component_interfaces hardware_interface fmt::fmt)
80-
ament_target_dependencies(test_component_interfaces ros2_control_test_assets fmt)
78+
target_link_libraries(test_component_interfaces hardware_interface)
79+
ament_target_dependencies(test_component_interfaces ros2_control_test_assets)
8180

8281
ament_add_gmock(test_component_interfaces_custom_export test/test_component_interfaces_custom_export.cpp)
83-
target_link_libraries(test_component_interfaces_custom_export hardware_interface fmt::fmt)
84-
ament_target_dependencies(test_component_interfaces_custom_export ros2_control_test_assets fmt)
82+
target_link_libraries(test_component_interfaces_custom_export hardware_interface)
83+
ament_target_dependencies(test_component_interfaces_custom_export ros2_control_test_assets)
8584

8685
ament_add_gmock(test_component_parser test/test_component_parser.cpp)
8786
target_link_libraries(test_component_parser hardware_interface)

‎hardware_interface/package.xml

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
<test_depend>ament_cmake_gmock</test_depend>
3434
<test_depend>ros2_control_test_assets</test_depend>
35-
<test_depend>fmt</test_depend>
3635

3736
<export>
3837
<build_type>ament_cmake</build_type>

‎hardware_interface_testing/CMakeLists.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ test/test_components/test_sensor.cpp
2626
test/test_components/test_system.cpp
2727
test/test_components/test_actuator_exclusive_interfaces.cpp)
2828
ament_target_dependencies(test_components hardware_interface pluginlib ros2_control_test_assets)
29-
target_link_libraries(test_components fmt::fmt)
3029
install(TARGETS test_components
3130
DESTINATION lib
3231
)
@@ -38,8 +37,8 @@ if(BUILD_TESTING)
3837
find_package(ament_cmake_gmock REQUIRED)
3938

4039
ament_add_gmock(test_resource_manager test/test_resource_manager.cpp)
41-
target_link_libraries(test_resource_manager fmt::fmt)
42-
ament_target_dependencies(test_resource_manager hardware_interface ros2_control_test_assets fmt)
40+
target_link_libraries(test_resource_manager)
41+
ament_target_dependencies(test_resource_manager hardware_interface ros2_control_test_assets)
4342

4443
ament_add_gmock(test_resource_manager_prepare_perform_switch test/test_resource_manager_prepare_perform_switch.cpp)
4544
ament_target_dependencies(test_resource_manager_prepare_perform_switch hardware_interface ros2_control_test_assets)

‎hardware_interface_testing/package.xml

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<depend>fmt</depend>
2222

2323
<test_depend>ament_cmake_gmock</test_depend>
24-
<test_depend>fmt</test_depend>
2524

2625
<export>
2726
<build_type>ament_cmake</build_type>

‎joint_limits/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ target_include_directories(joint_limits INTERFACE
2828
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
2929
$<INSTALL_INTERFACE:include/joint_limits>
3030
)
31+
target_link_libraries(joint_limits INTERFACE fmt::fmt)
3132
ament_target_dependencies(joint_limits INTERFACE ${THIS_PACKAGE_INCLUDE_DEPENDS})
3233

3334
add_library(joint_limiter_interface SHARED
@@ -74,14 +75,13 @@ if(BUILD_TESTING)
7475
find_package(rclcpp REQUIRED)
7576

7677
ament_add_gmock(joint_limits_rosparam_test test/joint_limits_rosparam_test.cpp)
77-
target_link_libraries(joint_limits_rosparam_test joint_limits fmt::fmt)
78+
target_link_libraries(joint_limits_rosparam_test joint_limits)
7879
target_compile_definitions(
7980
joint_limits_rosparam_test
80-
PRIVATE PARAMETERS_FILE_PATH="${CMAKE_CURRENT_LIST_DIR}/test/"
81-
)
81+
PRIVATE PARAMETERS_FILE_PATH="${CMAKE_CURRENT_LIST_DIR}/test/")
8282

8383
ament_add_gmock(joint_limits_urdf_test test/joint_limits_urdf_test.cpp)
84-
target_link_libraries(joint_limits_urdf_test joint_limits fmt::fmt)
84+
target_link_libraries(joint_limits_urdf_test joint_limits)
8585

8686
add_launch_test(test/joint_limits_rosparam.launch.py)
8787
install(

‎joint_limits/package.xml

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
<test_depend>generate_parameter_library</test_depend>
3232
<test_depend>launch_ros</test_depend>
3333
<test_depend>launch_testing_ament_cmake</test_depend>
34-
<test_depend>fmt</test_depend>
3534

3635
<export>
3736
<build_type>ament_cmake</build_type>

‎transmission_interface/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ target_include_directories(transmission_interface PUBLIC
2828
$<INSTALL_INTERFACE:include/transmission_interface>
2929
)
3030
ament_target_dependencies(transmission_interface PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS})
31-
target_link_libraries(transmission_interface PUBLIC fmt::fmt)
3231
pluginlib_export_plugin_description_file(transmission_interface ros2_control_plugins.xml)
3332

3433
if(BUILD_TESTING)

‎transmission_interface/package.xml

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
<test_depend>ament_cmake_gmock</test_depend>
2222
<test_depend>ros2_control_test_assets</test_depend>
23-
<test_depend>fmt</test_depend>
2423

2524
<export>
2625
<build_type>ament_cmake</build_type>

0 commit comments

Comments
 (0)