Builds, can use same CMake package names with workaround

Signed-off-by: Emerson Knapp <[email protected]>

Author: Emerson Knapp

rosbag2/CMakeLists.txt

@@ -2,4 +2,7 @@ cmake_minimum_required(VERSION 3.5)
 project(rosbag2)
 
 find_package(ament_cmake REQUIRED)
+# workaround so that package.xml can use _future, but other projects can find this without the suffix
+_ament_package_xml(${CMAKE_CURRENT_BINARY_DIR}/ament_cmake_core)
+set(_AMENT_PACKAGE_NAME ${PROJECT_NAME})
 ament_package()

rosbag2_compression/CMakeLists.txt

@@ -26,6 +26,9 @@ find_package(rcpputils REQUIRED)
 find_package(rcutils REQUIRED)
 find_package(rosbag2_cpp)
 find_package(rosbag2_storage REQUIRED)
+# workaround so that package.xml can use _future, but other projects can find this without the suffix
+_ament_package_xml(${CMAKE_CURRENT_BINARY_DIR}/ament_cmake_core)
+set(_AMENT_PACKAGE_NAME ${PROJECT_NAME})
 
 add_library(${PROJECT_NAME}
   SHARED

rosbag2_compression_zstd/CMakeLists.txt

@@ -26,6 +26,9 @@ find_package(rcpputils REQUIRED)
 find_package(rosbag2_compression REQUIRED)
 find_package(zstd_vendor REQUIRED)
 find_package(zstd REQUIRED)
+# workaround so that package.xml can use _future, but other projects can find this without the suffix
+_ament_package_xml(${CMAKE_CURRENT_BINARY_DIR}/ament_cmake_core)
+set(_AMENT_PACKAGE_NAME ${PROJECT_NAME})
 
 add_library(${PROJECT_NAME} SHARED
   src/rosbag2_compression_zstd/compression_utils.cpp

rosbag2_cpp/CMakeLists.txt

@@ -45,6 +45,9 @@ find_package(rosidl_runtime_c REQUIRED)
 find_package(rosidl_runtime_cpp REQUIRED)
 find_package(rosidl_typesupport_cpp REQUIRED)
 find_package(rosidl_typesupport_introspection_cpp REQUIRED)
+# workaround so that package.xml can use _future, but other projects can find this without the suffix
+_ament_package_xml(${CMAKE_CURRENT_BINARY_DIR}/ament_cmake_core)
+set(_AMENT_PACKAGE_NAME ${PROJECT_NAME})
 
 add_library(${PROJECT_NAME} SHARED
   src/rosbag2_cpp/cache/cache_consumer.cpp

rosbag2_performance/rosbag2_performance_benchmarking/CMakeLists.txt

@@ -11,6 +11,9 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 endif()
 
 find_package(ament_cmake REQUIRED)
+# workaround so that package.xml can use _future, but other projects can find this without the suffix
+_ament_package_xml(${CMAKE_CURRENT_BINARY_DIR}/ament_cmake_core)
+set(_AMENT_PACKAGE_NAME ${PROJECT_NAME})
 
 if(BUILD_ROSBAG2_BENCHMARKS)
   find_package(rclcpp REQUIRED)

rosbag2_py/CMakeLists.txt

@@ -21,6 +21,9 @@ find_package(ament_cmake_ros REQUIRED)
 find_package(rosbag2_compression REQUIRED)
 find_package(rosbag2_cpp REQUIRED)
 find_package(rosbag2_storage REQUIRED)
+# workaround so that package.xml can use _future, but other projects can find this without the suffix
+_ament_package_xml(${CMAKE_CURRENT_BINARY_DIR}/ament_cmake_core)
+set(_AMENT_PACKAGE_NAME ${PROJECT_NAME})
 
 # Find python before pybind11
 find_package(python_cmake_module REQUIRED)

rosbag2_storage/CMakeLists.txt

@@ -25,6 +25,9 @@ find_package(pluginlib REQUIRED)
 find_package(rcpputils REQUIRED)
 find_package(rcutils REQUIRED)
 find_package(yaml_cpp_vendor REQUIRED)
+# workaround so that package.xml can use _future, but other projects can find this without the suffix
+_ament_package_xml(${CMAKE_CURRENT_BINARY_DIR}/ament_cmake_core)
+set(_AMENT_PACKAGE_NAME ${PROJECT_NAME})
 
 add_library(
   ${PROJECT_NAME}

rosbag2_storage_default_plugins/CMakeLists.txt

@@ -28,6 +28,9 @@ find_package(rosbag2_storage REQUIRED)
 find_package(sqlite3_vendor REQUIRED)
 find_package(SQLite3 REQUIRED)  # provided by sqlite3_vendor
 find_package(yaml_cpp_vendor REQUIRED)
+# workaround so that package.xml can use _future, but other projects can find this without the suffix
+_ament_package_xml(${CMAKE_CURRENT_BINARY_DIR}/ament_cmake_core)
+set(_AMENT_PACKAGE_NAME ${PROJECT_NAME})
 
 add_library(${PROJECT_NAME} SHARED
   src/rosbag2_storage_default_plugins/sqlite/sqlite_wrapper.cpp

rosbag2_test_common/CMakeLists.txt

@@ -24,6 +24,10 @@ find_package(ament_cmake REQUIRED)
 find_package(rclcpp REQUIRED)
 find_package(rcutils REQUIRED)
 
+# workaround so that package.xml can use _future, but other projects can find this without the suffix
+_ament_package_xml(${CMAKE_CURRENT_BINARY_DIR}/ament_cmake_core)
+set(_AMENT_PACKAGE_NAME ${PROJECT_NAME})
+
 add_library(${PROJECT_NAME} INTERFACE)
 target_include_directories(${PROJECT_NAME} INTERFACE
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
@@ -46,4 +50,5 @@ ament_export_dependencies(rclcpp rcutils)
 
 ament_export_include_directories(include)
 ament_export_targets(export_${PROJECT_NAME})
+
 ament_package()

rosbag2_test_common/include/rosbag2_test_common/temporary_directory_fixture.hpp

@@ -31,7 +31,18 @@ class TemporaryDirectoryFixture : public Test
 public:
   TemporaryDirectoryFixture()
   {
-    temporary_dir_path_ = rcpputils::fs::create_temp_directory("tmp_test_dir_").string();
+    // Foxy compatibility. Adapt for lack of https://github.com/ros2/rcpputils/pull/126
+    char template_char[] = "tmp_test_dir.XXXXXX";
+    #ifdef _WIN32
+      char temp_path[255];
+      GetTempPathA(255, temp_path);
+      _mktemp_s(template_char, strnlen(template_char, 20) + 1);
+      temporary_dir_path_ = std::string(temp_path) + std::string(template_char);
+      _mkdir(temporary_dir_path_.c_str());
+    #else
+      char * dir_name = mkdtemp(template_char);
+      temporary_dir_path_ = dir_name;
+    #endif
   }
 
   ~TemporaryDirectoryFixture() override

rosbag2_tests/CMakeLists.txt

@@ -24,6 +24,9 @@ endif()
 
 find_package(ament_cmake REQUIRED)
 find_package(ament_index_cpp REQUIRED)
+# workaround so that package.xml can use _future, but other projects can find this without the suffix
+_ament_package_xml(${CMAKE_CURRENT_BINARY_DIR}/ament_cmake_core)
+set(_AMENT_PACKAGE_NAME ${PROJECT_NAME})
 
 if(BUILD_TESTING)
   find_package(ament_cmake_gmock REQUIRED)

rosbag2_transport/CMakeLists.txt

@@ -32,6 +32,9 @@ find_package(rosbag2_storage REQUIRED)
 find_package(rmw_implementation_cmake REQUIRED)
 find_package(shared_queues_vendor REQUIRED)
 find_package(yaml_cpp_vendor REQUIRED)
+# workaround so that package.xml can use _future, but other projects can find this without the suffix
+_ament_package_xml(${CMAKE_CURRENT_BINARY_DIR}/ament_cmake_core)
+set(_AMENT_PACKAGE_NAME ${PROJECT_NAME})
 
 add_library(${PROJECT_NAME} SHARED
   src/rosbag2_transport/player.cpp

rosbag2_transport/package.xml

@@ -14,20 +14,20 @@
 
   <depend>python_cmake_module</depend>
   <depend>rclcpp</depend>
-  <depend>rosbag2_compression</depend>
-  <depend>rosbag2_cpp</depend>
-  <depend>rosbag2_storage</depend>
+  <depend>rosbag2_compression_future</depend>
+  <depend>rosbag2_cpp_future</depend>
+  <depend>rosbag2_storage_future</depend>
   <depend>rmw</depend>
   <depend>rpyutils</depend>
-  <depend>shared_queues_vendor</depend>
+  <depend>shared_queues_vendor_future</depend>
   <depend>yaml_cpp_vendor</depend>
 
   <test_depend>ament_cmake_gmock</test_depend>
   <test_depend>ament_index_cpp</test_depend>
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>
   <test_depend>rmw_implementation_cmake</test_depend>
-  <test_depend>rosbag2_test_common</test_depend>
+  <test_depend>rosbag2_test_common_future</test_depend>
   <test_depend>test_msgs</test_depend>
 
   <export>

shared_queues_vendor/CMakeLists.txt

@@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.5)
 project(shared_queues_vendor)
 
 find_package(ament_cmake REQUIRED)
+# workaround so that package.xml can use _future, but other projects can find this without the suffix
+_ament_package_xml(${CMAKE_CURRENT_BINARY_DIR}/ament_cmake_core)
+set(_AMENT_PACKAGE_NAME ${PROJECT_NAME})
 
 include(ExternalProject)
 # Single producer single consumer queue by moodycamel - header only, don't build, install
@@ -54,4 +57,5 @@ install(
 
 ament_export_include_directories(include)
 ament_export_targets(export_${PROJECT_NAME})
+
 ament_package()

sqlite3_vendor/CMakeLists.txt

@@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.5)
 project(sqlite3_vendor)
 
 find_package(ament_cmake REQUIRED)
+# workaround so that package.xml can use _future, but other projects can find this without the suffix
+_ament_package_xml(${CMAKE_CURRENT_BINARY_DIR}/ament_cmake_core)
+set(_AMENT_PACKAGE_NAME ${PROJECT_NAME})
 
 option(FORCE_BUILD_VENDOR_PKG
   "Build SQLite3 from source, even if system-installed package is available"

zstd_vendor/CMakeLists.txt

@@ -3,6 +3,9 @@ cmake_minimum_required(VERSION 3.7)
 project(zstd_vendor)
 
 find_package(ament_cmake REQUIRED)
+# workaround so that package.xml can use _future, but other projects can find this without the suffix
+_ament_package_xml(${CMAKE_CURRENT_BINARY_DIR}/ament_cmake_core)
+set(_AMENT_PACKAGE_NAME ${PROJECT_NAME})
 
 option(FORCE_BUILD_VENDOR_PKG
   "Build zstd from source, even if system-installed package is available"