From 9d7b2c33c7d981cd32c643ad543a0e6e73304b99 Mon Sep 17 00:00:00 2001 From: Martin Idel Date: Thu, 6 Dec 2018 10:03:49 +0100 Subject: [PATCH] GH-14 Refactor rosbag_storage vendor package - Improve toplevel CMakeLists - Put all patches into a resource subfolder --- ros1_rosbag_storage_vendor/CMakeLists.txt | 6 +++--- ros1_rosbag_storage_vendor/cmake/CMakeLists.txt.in | 5 +++-- .../{ => resources}/rosbag1_ament_patch.diff | 0 .../{ => resources}/rosbag1_encryption_patch.diff | 0 .../{ => resources}/rosbag1_for_ros2_patch.diff | 0 5 files changed, 6 insertions(+), 5 deletions(-) rename ros1_rosbag_storage_vendor/{ => resources}/rosbag1_ament_patch.diff (100%) rename ros1_rosbag_storage_vendor/{ => resources}/rosbag1_encryption_patch.diff (100%) rename ros1_rosbag_storage_vendor/{ => resources}/rosbag1_for_ros2_patch.diff (100%) diff --git a/ros1_rosbag_storage_vendor/CMakeLists.txt b/ros1_rosbag_storage_vendor/CMakeLists.txt index e983408feb..6243583839 100644 --- 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 index 5707014dd7..9b124b9fad 100644 --- 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) \ No newline at end of file +add_subdirectory(tools/rosbag_storage) diff --git a/ros1_rosbag_storage_vendor/rosbag1_ament_patch.diff b/ros1_rosbag_storage_vendor/resources/rosbag1_ament_patch.diff similarity index 100% rename from ros1_rosbag_storage_vendor/rosbag1_ament_patch.diff rename to ros1_rosbag_storage_vendor/resources/rosbag1_ament_patch.diff diff --git a/ros1_rosbag_storage_vendor/rosbag1_encryption_patch.diff b/ros1_rosbag_storage_vendor/resources/rosbag1_encryption_patch.diff similarity index 100% rename from ros1_rosbag_storage_vendor/rosbag1_encryption_patch.diff rename to ros1_rosbag_storage_vendor/resources/rosbag1_encryption_patch.diff diff --git a/ros1_rosbag_storage_vendor/rosbag1_for_ros2_patch.diff b/ros1_rosbag_storage_vendor/resources/rosbag1_for_ros2_patch.diff similarity index 100% rename from ros1_rosbag_storage_vendor/rosbag1_for_ros2_patch.diff rename to ros1_rosbag_storage_vendor/resources/rosbag1_for_ros2_patch.diff