Skip to content

Commit acd16ed

Browse files
SteveMacenskiSteveMacenski
authored
bumping rolling to 3.3.0 for initial release and fixing various rolling related build failures (#694)
* bumping rolling to 3.3.0 for initial release * fix deprecation warning in cmake rosidl linking
1 parent a1e48b4 commit acd16ed

10 files changed

+35
-28
lines changed

‎CMakeLists.txt‎

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ add_library(
7373
src/ros_filter_utilities.cpp
7474
src/ros_robot_localization_listener.cpp)
7575

76-
rosidl_target_interfaces(${library_name}
77-
${PROJECT_NAME} "rosidl_typesupport_cpp")
76+
rosidl_get_typesupport_target(cpp_typesupport_target "${PROJECT_NAME}" "rosidl_typesupport_cpp")
77+
target_link_libraries(${library_name} "${cpp_typesupport_target}")
7878

7979
add_executable(
8080
ekf_node
@@ -177,8 +177,10 @@ if(BUILD_TESTING)
177177
ament_add_gtest_executable(test_filter_base_diagnostics_timestamps
178178
test/test_filter_base_diagnostics_timestamps.cpp)
179179
target_link_libraries(test_filter_base_diagnostics_timestamps ${library_name})
180-
rosidl_target_interfaces(test_filter_base_diagnostics_timestamps
181-
${PROJECT_NAME} "rosidl_typesupport_cpp")
180+
181+
rosidl_get_typesupport_target(cpp_typesupport_target "${PROJECT_NAME}" "rosidl_typesupport_cpp")
182+
target_link_libraries(test_filter_base_diagnostics_timestamps "${cpp_typesupport_target}")
183+
182184
add_dependencies(test_filter_base_diagnostics_timestamps ekf_node)
183185
ament_add_test(test_filter_base_diagnostics_timestamps
184186
GENERATE_RESULT_FOR_RETURN_CODE_ZERO
@@ -190,14 +192,17 @@ if(BUILD_TESTING)
190192
#### EKF TESTS ######
191193
ament_add_gtest(test_ekf test/test_ekf.cpp)
192194
target_link_libraries(test_ekf ${library_name})
193-
rosidl_target_interfaces(test_ekf
194-
${PROJECT_NAME} "rosidl_typesupport_cpp")
195+
196+
rosidl_get_typesupport_target(cpp_typesupport_target "${PROJECT_NAME}" "rosidl_typesupport_cpp")
197+
target_link_libraries(test_ekf "${cpp_typesupport_target}")
195198

196199
ament_add_gtest_executable(test_ekf_localization_node_interfaces
197200
test/test_ekf_localization_node_interfaces.cpp)
198201
target_link_libraries(test_ekf_localization_node_interfaces ${library_name})
199-
rosidl_target_interfaces(test_ekf_localization_node_interfaces
200-
${PROJECT_NAME} "rosidl_typesupport_cpp")
202+
203+
rosidl_get_typesupport_target(cpp_typesupport_target "${PROJECT_NAME}" "rosidl_typesupport_cpp")
204+
target_link_libraries(test_ekf_localization_node_interfaces "${cpp_typesupport_target}")
205+
201206
add_dependencies(test_ekf_localization_node_interfaces ekf_node)
202207
ament_add_test(test_ekf_localization_node_interfaces
203208
GENERATE_RESULT_FOR_RETURN_CODE_ZERO
@@ -209,15 +214,17 @@ if(BUILD_TESTING)
209214
#### UKF TESTS #####
210215
ament_add_gtest(test_ukf test/test_ukf.cpp)
211216
target_link_libraries(test_ukf ${library_name})
212-
rosidl_target_interfaces(test_ukf
213-
${PROJECT_NAME} "rosidl_typesupport_cpp")
214217

218+
rosidl_get_typesupport_target(cpp_typesupport_target "${PROJECT_NAME}" "rosidl_typesupport_cpp")
219+
target_link_libraries(test_ukf "${cpp_typesupport_target}")
215220

216221
ament_add_gtest_executable(test_ukf_localization_node_interfaces
217222
test/test_ukf_localization_node_interfaces.cpp)
218223
target_link_libraries(test_ukf_localization_node_interfaces ${library_name})
219-
rosidl_target_interfaces(test_ukf_localization_node_interfaces
220-
${PROJECT_NAME} "rosidl_typesupport_cpp")
224+
225+
rosidl_get_typesupport_target(cpp_typesupport_target "${PROJECT_NAME}" "rosidl_typesupport_cpp")
226+
target_link_libraries(test_ukf_localization_node_interfaces "${cpp_typesupport_target}")
227+
221228
add_dependencies(test_ukf_localization_node_interfaces ukf_node)
222229
ament_add_test(test_ukf_localization_node_interfaces
223230
GENERATE_RESULT_FOR_RETURN_CODE_ZERO
@@ -249,8 +256,8 @@ if(BUILD_TESTING)
249256
ament_add_gtest_executable(test_robot_localization_estimator
250257
test/test_robot_localization_estimator.cpp)
251258
target_link_libraries(test_robot_localization_estimator ${library_name})
252-
rosidl_target_interfaces(test_robot_localization_estimator
253-
${PROJECT_NAME} "rosidl_typesupport_cpp")
259+
rosidl_get_typesupport_target(cpp_typesupport_target "${PROJECT_NAME}" "rosidl_typesupport_cpp")
260+
target_link_libraries(test_robot_localization_estimator "${cpp_typesupport_target}")
254261
ament_add_test(test_robot_localization_estimator
255262
GENERATE_RESULT_FOR_RETURN_CODE_ZERO
256263
TIMEOUT 100
@@ -261,13 +268,13 @@ if(BUILD_TESTING)
261268
ament_add_gtest_executable(test_ros_robot_localization_listener
262269
test/test_ros_robot_localization_listener.cpp)
263270
target_link_libraries(test_ros_robot_localization_listener ${library_name})
264-
rosidl_target_interfaces(test_ros_robot_localization_listener
265-
${PROJECT_NAME} "rosidl_typesupport_cpp")
271+
rosidl_get_typesupport_target(cpp_typesupport_target "${PROJECT_NAME}" "rosidl_typesupport_cpp")
272+
target_link_libraries(test_ros_robot_localization_listener "${cpp_typesupport_target}")
266273
ament_add_gtest_executable(test_ros_robot_localization_listener_publisher
267274
test/test_ros_robot_localization_listener_publisher.cpp)
268275
target_link_libraries(test_ros_robot_localization_listener_publisher ${library_name})
269-
rosidl_target_interfaces(test_ros_robot_localization_listener_publisher
270-
${PROJECT_NAME} "rosidl_typesupport_cpp")
276+
rosidl_get_typesupport_target(cpp_typesupport_target "${PROJECT_NAME}" "rosidl_typesupport_cpp")
277+
target_link_libraries(test_ros_robot_localization_listener_publisher "${cpp_typesupport_target}")
271278
ament_add_test(test_ros_robot_localization_listener
272279
GENERATE_RESULT_FOR_RETURN_CODE_ZERO
273280
TIMEOUT 100

‎include/robot_localization/ros_robot_localization_listener.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ namespace robot_localization
5151

5252
namespace detail
5353
{
54-
rclcpp::SubscriptionOptions
54+
inline rclcpp::SubscriptionOptions
5555
get_subscription_options_with_default_qos_override_policies()
5656
{
5757
auto subscription_options = rclcpp::SubscriptionOptions();

‎package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>robot_localization</name>
5-
<version>3.2.1</version>
5+
<version>3.3.0</version>
66
<description>Provides nonlinear state estimation through sensor fusion of an abritrary number of sensors.</description>
77

88
<author email="[email protected]">Tom Moore</author>

‎src/navsat_transform.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#include <rclcpp/rclcpp.hpp>
4343
#include <sensor_msgs/msg/imu.hpp>
4444
#include <sensor_msgs/msg/nav_sat_fix.hpp>
45-
#include <tf2_geometry_msgs/tf2_geometry_msgs.h>
45+
#include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
4646

4747
#include <Eigen/Dense>
4848

‎src/ros_filter.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
#include <rclcpp/qos.hpp>
4242
#include <rclcpp/rclcpp.hpp>
4343
#include <sensor_msgs/msg/imu.hpp>
44-
#include <tf2_geometry_msgs/tf2_geometry_msgs.h>
44+
#include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
4545

4646
#include <algorithm>
4747
#include <iostream>

‎src/ros_filter_utilities.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include <robot_localization/filter_utilities.hpp>
3636
#include <robot_localization/ros_filter_utilities.hpp>
3737
#include <tf2/time.h>
38-
#include <tf2_geometry_msgs/tf2_geometry_msgs.h>
38+
#include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
3939
#include <tf2_ros/buffer.h>
4040

4141
#include <string>

‎src/ros_robot_localization_listener.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
#include <tf2/LinearMath/Matrix3x3.h>
3838
#include <tf2/LinearMath/Quaternion.h>
3939
#include <tf2/time.h>
40-
#include <tf2_eigen/tf2_eigen.h>
41-
#include <tf2_geometry_msgs/tf2_geometry_msgs.h>
40+
#include <tf2_eigen/tf2_eigen.hpp>
41+
#include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
4242
#include <yaml-cpp/yaml.h>
4343

4444
#include <exception>

‎test/test_ekf_localization_node_interfaces.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include <rclcpp/qos.hpp>
3939
#include <sensor_msgs/msg/imu.hpp>
4040
#include <tf2/LinearMath/Quaternion.h>
41-
#include <tf2_geometry_msgs/tf2_geometry_msgs.h>
41+
#include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
4242

4343
#include <chrono>
4444
#include <functional>

‎test/test_ros_robot_localization_listener_publisher.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
#include <geometry_msgs/msg/accel_with_covariance_stamped.hpp>
3434
#include <nav_msgs/msg/odometry.hpp>
3535
#include <rclcpp/rclcpp.hpp>
36-
#include <tf2/utils.h>
3736
#include <tf2_ros/static_transform_broadcaster.h>
37+
#include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
3838

3939
#include <string>
4040
#include <memory>

‎test/test_ukf_localization_node_interfaces.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include <rclcpp/qos.hpp>
3838
#include <sensor_msgs/msg/imu.hpp>
3939
#include <tf2/LinearMath/Quaternion.h>
40-
#include <tf2_geometry_msgs/tf2_geometry_msgs.h>
40+
#include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
4141

4242
#include <chrono>
4343
#include <functional>

0 commit comments

Comments
 (0)