From 18dbb455cf7756c27c537c6eda6deeb62ef9c0e9 Mon Sep 17 00:00:00 2001
From: Audrow Nash <audrow@openrobotics.org>
Date: Tue, 21 May 2024 14:53:45 +0000
Subject: [PATCH 1/2] Link rcpputils::filesystem to solve error on RHEL

Signed-off-by: GitHub <noreply@github.com>
---
 rosbag2_compression/CMakeLists.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/rosbag2_compression/CMakeLists.txt b/rosbag2_compression/CMakeLists.txt
index 4dc4bd520..5ef91115e 100644
--- a/rosbag2_compression/CMakeLists.txt
+++ b/rosbag2_compression/CMakeLists.txt
@@ -45,6 +45,12 @@ ament_target_dependencies(${PROJECT_NAME}
   rosbag2_storage)
 target_compile_definitions(${PROJECT_NAME} PRIVATE ROSBAG2_COMPRESSION_BUILDING_DLL)
 
+if(CMAKE_COMPILER_IS_GNUCXX)
+  target_link_libraries(${PROJECT_NAME}
+    rcpputils::filesystem
+  )
+endif()
+
 install(
   DIRECTORY include/
   DESTINATION include/${PROJECT_NAME})

From e8f4a0701f2a9615985236d566ccdfe7acb496dd Mon Sep 17 00:00:00 2001
From: Chris Lalancette <clalancette@gmail.com>
Date: Tue, 21 May 2024 15:53:20 +0000
Subject: [PATCH 2/2] Switch back to rcpputils::fs

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
---
 rosbag2_compression/CMakeLists.txt                   |  6 ------
 .../test_sequential_compression_writer.cpp           | 12 +++++-------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/rosbag2_compression/CMakeLists.txt b/rosbag2_compression/CMakeLists.txt
index 5ef91115e..4dc4bd520 100644
--- a/rosbag2_compression/CMakeLists.txt
+++ b/rosbag2_compression/CMakeLists.txt
@@ -45,12 +45,6 @@ ament_target_dependencies(${PROJECT_NAME}
   rosbag2_storage)
 target_compile_definitions(${PROJECT_NAME} PRIVATE ROSBAG2_COMPRESSION_BUILDING_DLL)
 
-if(CMAKE_COMPILER_IS_GNUCXX)
-  target_link_libraries(${PROJECT_NAME}
-    rcpputils::filesystem
-  )
-endif()
-
 install(
   DIRECTORY include/
   DESTINATION include/${PROJECT_NAME})
diff --git a/rosbag2_compression/test/rosbag2_compression/test_sequential_compression_writer.cpp b/rosbag2_compression/test/rosbag2_compression/test_sequential_compression_writer.cpp
index 321af54cd..bab1fcc45 100644
--- a/rosbag2_compression/test/rosbag2_compression/test_sequential_compression_writer.cpp
+++ b/rosbag2_compression/test/rosbag2_compression/test_sequential_compression_writer.cpp
@@ -14,7 +14,6 @@
 
 #include <gmock/gmock.h>
 
-#include <filesystem>
 #include <fstream>
 #include <memory>
 #include <string>
@@ -22,6 +21,7 @@
 #include <vector>
 
 #include "rcpputils/asserts.hpp"
+#include "rcpputils/filesystem_helper.hpp"
 
 #include "rosbag2_compression/compression_options.hpp"
 #include "rosbag2_compression/sequential_compression_writer.hpp"
@@ -39,8 +39,6 @@
 
 using namespace testing;  // NOLINT
 
-namespace fs = std::filesystem;
-
 static constexpr const char * DefaultTestCompressor = "fake_comp";
 
 class SequentialCompressionWriterTest : public Test
@@ -51,12 +49,12 @@ class SequentialCompressionWriterTest : public Test
     storage_{std::make_shared<NiceMock<MockStorage>>()},
     converter_factory_{std::make_shared<StrictMock<MockConverterFactory>>()},
     metadata_io_{std::make_unique<NiceMock<MockMetadataIo>>()},
-    tmp_dir_{fs::temp_directory_path() / "SequentialCompressionWriterTest"},
+    tmp_dir_{rcpputils::fs::temp_directory_path() / "SequentialCompressionWriterTest"},
     tmp_dir_storage_options_{},
     serialization_format_{"rmw_format"}
   {
     tmp_dir_storage_options_.uri = tmp_dir_.string();
-    fs::remove_all(tmp_dir_);
+    rcpputils::fs::remove_all(tmp_dir_);
     ON_CALL(*storage_factory_, open_read_write(_)).WillByDefault(Return(storage_));
     EXPECT_CALL(*storage_factory_, open_read_write(_)).Times(AtLeast(0));
     // intercept the metadata write so we can analyze it.
@@ -68,7 +66,7 @@ class SequentialCompressionWriterTest : public Test
 
   ~SequentialCompressionWriterTest()
   {
-    fs::remove_all(tmp_dir_);
+    rcpputils::fs::remove_all(tmp_dir_);
   }
 
   void initializeFakeFileStorage()
@@ -127,7 +125,7 @@ class SequentialCompressionWriterTest : public Test
   std::shared_ptr<NiceMock<MockStorage>> storage_;
   std::shared_ptr<StrictMock<MockConverterFactory>> converter_factory_;
   std::unique_ptr<MockMetadataIo> metadata_io_;
-  fs::path tmp_dir_;
+  rcpputils::fs::path tmp_dir_;
   rosbag2_storage::StorageOptions tmp_dir_storage_options_;
   rosbag2_storage::BagMetadata intercepted_metadata_;
   std::unique_ptr<rosbag2_cpp::Writer> writer_;