Merge pull request #1 from usdot-fhwa-stol/feature/integrate-carma

Define packages as ROS 2 carma packages
usdot-fhwa-stol · Aug 23, 2023 · 73a1a0c · 73a1a0c
2 parents 67564a4 + cfb8b39
commit 73a1a0c
Show file tree

Hide file tree

Showing 30 changed files with 86 additions and 0 deletions.
diff --git a/ros2bag/package.xml b/ros2bag/package.xml
@@ -11,6 +11,8 @@
   <maintainer email="ros-tooling@googlegroups.com">ROS Tooling Working Group</maintainer>
   <license>Apache License 2.0</license>
 
+  <build_depend>carma_cmake_common</build_depend>
+
   <depend>ros2cli</depend>
   <depend>rosbag2_py</depend>
   <depend>rosbag2_transport</depend>

diff --git a/rosbag2/CMakeLists.txt b/rosbag2/CMakeLists.txt
@@ -1,5 +1,10 @@
 cmake_minimum_required(VERSION 3.5)
 project(rosbag2)
 
+# Declare carma package and check ROS version
+find_package(carma_cmake_common REQUIRED)
+carma_check_ros_version(2)
+carma_package()
+
 find_package(ament_cmake REQUIRED)
 ament_package()
diff --git a/rosbag2/package.xml b/rosbag2/package.xml
@@ -9,6 +9,7 @@
   <license>Apache License 2.0</license>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
+  <build_depend>carma_cmake_common</build_depend>
 
   <exec_depend>ros2bag</exec_depend>
   <exec_depend>rosbag2_compression</exec_depend>

diff --git a/rosbag2_compression/CMakeLists.txt b/rosbag2_compression/CMakeLists.txt
@@ -1,6 +1,11 @@
 cmake_minimum_required(VERSION 3.5)
 project(rosbag2_compression)
 
+# Declare carma package and check ROS version
+find_package(carma_cmake_common REQUIRED)
+carma_check_ros_version(2)
+carma_package()
+
 # Default to C99
 if(NOT CMAKE_C_STANDARD)
   set(CMAKE_C_STANDARD 99)

diff --git a/rosbag2_compression/package.xml b/rosbag2_compression/package.xml
@@ -10,6 +10,7 @@
   <license>Apache License 2.0</license>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
+  <build_depend>carma_cmake_common</build_depend>
 
   <depend>rcpputils</depend>
   <depend>rcutils</depend>

diff --git a/rosbag2_compression_zstd/CMakeLists.txt b/rosbag2_compression_zstd/CMakeLists.txt
@@ -1,6 +1,11 @@
 cmake_minimum_required(VERSION 3.5)
 project(rosbag2_compression_zstd)
 
+# Declare carma package and check ROS version
+find_package(carma_cmake_common REQUIRED)
+carma_check_ros_version(2)
+carma_package()
+
 # Default to C99
 if(NOT CMAKE_C_STANDARD)
   set(CMAKE_C_STANDARD 99)

diff --git a/rosbag2_compression_zstd/package.xml b/rosbag2_compression_zstd/package.xml
@@ -12,6 +12,7 @@
   <author email="eknapp@amazon.com">Emerson Knapp</author>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
+  <build_depend>carma_cmake_common</build_depend>
 
   <depend>pluginlib</depend>
   <depend>rcpputils</depend>

diff --git a/rosbag2_cpp/CMakeLists.txt b/rosbag2_cpp/CMakeLists.txt
@@ -1,6 +1,11 @@
 cmake_minimum_required(VERSION 3.5)
 project(rosbag2_cpp)
 
+# Declare carma package and check ROS version
+find_package(carma_cmake_common REQUIRED)
+carma_check_ros_version(2)
+carma_package()
+
 # Default to C99
 if(NOT CMAKE_C_STANDARD)
   set(CMAKE_C_STANDARD 99)

diff --git a/rosbag2_cpp/package.xml b/rosbag2_cpp/package.xml
@@ -9,6 +9,7 @@
   <license>Apache License 2.0</license>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
+  <build_depend>carma_cmake_common</build_depend>
 
   <depend>ament_index_cpp</depend>
   <depend>pluginlib</depend>

diff --git a/rosbag2_performance/rosbag2_performance_benchmarking/CMakeLists.txt b/rosbag2_performance/rosbag2_performance_benchmarking/CMakeLists.txt
@@ -1,6 +1,11 @@
 cmake_minimum_required(VERSION 3.5)
 project(rosbag2_performance_benchmarking)
 
+# Declare carma package and check ROS version
+find_package(carma_cmake_common REQUIRED)
+carma_check_ros_version(2)
+carma_package()
+
 # Default to C++14
 if(NOT CMAKE_CXX_STANDARD)
   set(CMAKE_CXX_STANDARD 14)

diff --git a/rosbag2_performance/rosbag2_performance_benchmarking/package.xml b/rosbag2_performance/rosbag2_performance_benchmarking/package.xml
@@ -10,6 +10,7 @@
   <license>Apache License 2.0</license>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
+  <build_depend>carma_cmake_common</build_depend>
 
   <depend>rclcpp</depend>
   <depend>rosbag2_compression</depend>

diff --git a/rosbag2_py/CMakeLists.txt b/rosbag2_py/CMakeLists.txt
@@ -1,6 +1,11 @@
 cmake_minimum_required(VERSION 3.5)
 project(rosbag2_py)
 
+# Declare carma package and check ROS version
+find_package(carma_cmake_common REQUIRED)
+carma_check_ros_version(2)
+carma_package()
+
 # Default to C99
 if(NOT CMAKE_C_STANDARD)
   set(CMAKE_C_STANDARD 99)

diff --git a/rosbag2_py/package.xml b/rosbag2_py/package.xml
@@ -15,6 +15,7 @@
   <buildtool_depend>ament_cmake_ros</buildtool_depend>
   <buildtool_depend>ament_cmake_python</buildtool_depend>
   <buildtool_depend>python_cmake_module</buildtool_depend>
+  <build_depend>carma_cmake_common</build_depend>
 
   <depend>pybind11_vendor</depend>
   <depend>rosbag2_compression</depend>

diff --git a/rosbag2_storage/CMakeLists.txt b/rosbag2_storage/CMakeLists.txt
@@ -1,6 +1,11 @@
 cmake_minimum_required(VERSION 3.5)
 project(rosbag2_storage)
 
+# Declare carma package and check ROS version
+find_package(carma_cmake_common REQUIRED)
+carma_check_ros_version(2)
+carma_package()
+
 # Default to C99
 if(NOT CMAKE_C_STANDARD)
   set(CMAKE_C_STANDARD 99)

diff --git a/rosbag2_storage/package.xml b/rosbag2_storage/package.xml
@@ -9,6 +9,7 @@
   <license>Apache License 2.0</license>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
+  <build_depend>carma_cmake_common</build_depend>
 
   <depend>pluginlib</depend>
   <depend>rcpputils</depend>

diff --git a/rosbag2_storage_default_plugins/CMakeLists.txt b/rosbag2_storage_default_plugins/CMakeLists.txt
@@ -1,6 +1,10 @@
 cmake_minimum_required(VERSION 3.5)
 project(rosbag2_storage_default_plugins)
 
+find_package(carma_cmake_common REQUIRED)
+carma_check_ros_version(2)
+carma_package()
+
 # Default to C99
 if(NOT CMAKE_C_STANDARD)
   set(CMAKE_C_STANDARD 99)

diff --git a/rosbag2_storage_default_plugins/package.xml b/rosbag2_storage_default_plugins/package.xml
@@ -9,6 +9,7 @@
   <license>Apache License 2.0</license>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
+  <build_depend>carma_cmake_common</build_depend>
 
   <depend>pluginlib</depend>
   <depend>rcpputils</depend>

diff --git a/rosbag2_storage_evaluation/CMakeLists.txt b/rosbag2_storage_evaluation/CMakeLists.txt
@@ -2,6 +2,10 @@ cmake_minimum_required(VERSION 3.5)
 
 project(ros2_rosbag_evaluation)
 
+find_package(carma_cmake_common REQUIRED)
+carma_check_ros_version(2)
+carma_package()
+
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_FLAGS "-O3")
 set(BUILD_SHARED_LIBS ON)

diff --git a/rosbag2_test_common/CMakeLists.txt b/rosbag2_test_common/CMakeLists.txt
@@ -1,6 +1,10 @@
 cmake_minimum_required(VERSION 3.5)
 project(rosbag2_test_common)
 
+find_package(carma_cmake_common REQUIRED)
+carma_check_ros_version(2)
+carma_package()
+
 # Default to C99
 if(NOT CMAKE_C_STANDARD)
   set(CMAKE_C_STANDARD 99)

diff --git a/rosbag2_test_common/package.xml b/rosbag2_test_common/package.xml
@@ -10,6 +10,7 @@
   <license>Apache License 2.0</license>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
+  <build_depend>carma_cmake_common</build_depend>
 
   <build_depend>rclcpp</build_depend>
   <build_depend>rcutils</build_depend>

diff --git a/rosbag2_tests/CMakeLists.txt b/rosbag2_tests/CMakeLists.txt
@@ -1,6 +1,11 @@
 cmake_minimum_required(VERSION 3.5)
 project(rosbag2_tests)
 
+# Declare carma package and check ROS version
+find_package(carma_cmake_common REQUIRED)
+carma_check_ros_version(2)
+carma_package()
+
 add_definitions(-D_SRC_RESOURCES_DIR_PATH="${CMAKE_CURRENT_SOURCE_DIR}/resources")
 
 # Default to C99

diff --git a/rosbag2_tests/package.xml b/rosbag2_tests/package.xml
@@ -10,6 +10,7 @@
   <license>Apache License 2.0</license>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
+  <build_depend>carma_cmake_common</build_depend>
 
   <depend>ament_index_cpp</depend>
 

diff --git a/rosbag2_transport/CMakeLists.txt b/rosbag2_transport/CMakeLists.txt
@@ -1,6 +1,10 @@
 cmake_minimum_required(VERSION 3.5)
 project(rosbag2_transport)
 
+find_package(carma_cmake_common REQUIRED)
+carma_check_ros_version(2)
+carma_package()
+
 # Default to C99
 if(NOT CMAKE_C_STANDARD)
   set(CMAKE_C_STANDARD 99)

diff --git a/rosbag2_transport/package.xml b/rosbag2_transport/package.xml
@@ -10,6 +10,7 @@
   <license>Apache License 2.0</license>
 
   <buildtool_depend>ament_cmake_ros</buildtool_depend>
+  <build_depend>carma_cmake_common</build_depend>
 
   <depend>python_cmake_module</depend>
   <depend>rclcpp</depend>

diff --git a/shared_queues_vendor/CMakeLists.txt b/shared_queues_vendor/CMakeLists.txt
@@ -1,6 +1,11 @@
 cmake_minimum_required(VERSION 3.5)
 project(shared_queues_vendor)
 
+# Declare carma package and check ROS version
+find_package(carma_cmake_common REQUIRED)
+carma_check_ros_version(2)
+carma_package()
+
 find_package(ament_cmake REQUIRED)
 
 include(ExternalProject)

diff --git a/shared_queues_vendor/package.xml b/shared_queues_vendor/package.xml
@@ -10,6 +10,7 @@
   <license>Apache License 2.0</license>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
+  <build_depend>carma_cmake_common</build_depend>
 
   <export>
     <build_type>ament_cmake</build_type>

diff --git a/sqlite3_vendor/CMakeLists.txt b/sqlite3_vendor/CMakeLists.txt
@@ -1,6 +1,11 @@
 cmake_minimum_required(VERSION 3.5)
 project(sqlite3_vendor)
 
+# Declare carma package and check ROS version
+find_package(carma_cmake_common REQUIRED)
+carma_check_ros_version(2)
+carma_package()
+
 find_package(ament_cmake REQUIRED)
 
 option(FORCE_BUILD_VENDOR_PKG

diff --git a/sqlite3_vendor/package.xml b/sqlite3_vendor/package.xml
@@ -10,6 +10,7 @@
   <license>Apache License 2.0</license>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
+  <build_depend>carma_cmake_common</build_depend>
 
   <depend>libsqlite3-dev</depend>
 

diff --git a/zstd_vendor/CMakeLists.txt b/zstd_vendor/CMakeLists.txt
@@ -2,6 +2,10 @@ cmake_minimum_required(VERSION 3.7)
 
 project(zstd_vendor)
 
+find_package(carma_cmake_common REQUIRED)
+carma_check_ros_version(2)
+carma_package()
+
 find_package(ament_cmake REQUIRED)
 
 option(FORCE_BUILD_VENDOR_PKG

diff --git a/zstd_vendor/package.xml b/zstd_vendor/package.xml
@@ -13,6 +13,7 @@
   <url type="website">https://facebook.github.io/zstd/</url>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
+  <build_depend>carma_cmake_common</build_depend>
 
   <depend>libzstd-dev</depend>