GH-14 Refactor rosbag_storage vendor package

- Improve toplevel CMakeLists - Put all patches into a resource subfolder
ros2 · Dec 6, 2018 · 9d7b2c3 · 9d7b2c3
1 parent 20bbce9
commit 9d7b2c3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/ros1_rosbag_storage_vendor/CMakeLists.txt b/ros1_rosbag_storage_vendor/CMakeLists.txt
@@ -43,9 +43,9 @@ ExternalProject_Add(ros1_rosbag_storage
   SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/sources
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/rosbag_install
   PATCH_COMMAND
-    ${git_apply} ${CMAKE_CURRENT_SOURCE_DIR}/rosbag1_encryption_patch.diff &&
-    ${git_apply} ${CMAKE_CURRENT_SOURCE_DIR}/rosbag1_for_ros2_patch.diff &&
-    ${git_apply} ${CMAKE_CURRENT_SOURCE_DIR}/rosbag1_ament_patch.diff &&
+    ${git_apply} ${CMAKE_CURRENT_SOURCE_DIR}/resources/rosbag1_encryption_patch.diff &&
+    ${git_apply} ${CMAKE_CURRENT_SOURCE_DIR}/resources/rosbag1_for_ros2_patch.diff &&
+    ${git_apply} ${CMAKE_CURRENT_SOURCE_DIR}/resources/rosbag1_ament_patch.diff &&
     ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cmake/CMakeLists.txt.in ${CMAKE_CURRENT_BINARY_DIR}/sources/CMakeLists.txt
 )
 

diff --git a/ros1_rosbag_storage_vendor/cmake/CMakeLists.txt.in b/ros1_rosbag_storage_vendor/cmake/CMakeLists.txt.in
@@ -1,4 +1,5 @@
-# rosbag_storage does not contain a toplevel CMakeLists so colcon gets confused
+# We download ros_comm, which does not contain a toplevel CMakeLists so colcon can't find the entry
+# point and claims there is nothing to build.
 # This is also an opportunity, because we want to only build rosbag_storage anyways
 cmake_minimum_required(VERSION 3.5)
-add_subdirectory(tools/rosbag_storage)
+add_subdirectory(tools/rosbag_storage)
diff --git a/...g_storage_vendor/rosbag1_ament_patch.diff → ...vendor/resources/rosbag1_ament_patch.diff b/...g_storage_vendor/rosbag1_ament_patch.diff → ...vendor/resources/rosbag1_ament_patch.diff
diff --git a/...rage_vendor/rosbag1_encryption_patch.diff → ...r/resources/rosbag1_encryption_patch.diff b/...rage_vendor/rosbag1_encryption_patch.diff → ...r/resources/rosbag1_encryption_patch.diff
diff --git a/...torage_vendor/rosbag1_for_ros2_patch.diff → ...dor/resources/rosbag1_for_ros2_patch.diff b/...torage_vendor/rosbag1_for_ros2_patch.diff → ...dor/resources/rosbag1_for_ros2_patch.diff