From f3606f91ee21e2373b740284384bf70976edd498 Mon Sep 17 00:00:00 2001
From: Michael Orlov <michael.orlov@apex.ai>
Date: Tue, 25 Oct 2022 08:48:05 -0700
Subject: [PATCH] Install `mcap` headers in `include/${PROJECT_NAME}/mcap` and
 export them

Signed-off-by: Michael Orlov <michael.orlov@apex.ai>
---
 mcap_vendor/CMakeLists.txt                | 4 ++--
 rosbag2_storage_mcap/src/mcap_storage.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mcap_vendor/CMakeLists.txt b/mcap_vendor/CMakeLists.txt
index 37a2d27..1e04c1d 100644
--- a/mcap_vendor/CMakeLists.txt
+++ b/mcap_vendor/CMakeLists.txt
@@ -52,7 +52,7 @@ macro(build_mcap_vendor)
 
   install(
     DIRECTORY ${_mcap_include_dir}/mcap
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/include
+    DESTINATION include/${PROJECT_NAME}
   )
 
   install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME})
@@ -61,7 +61,7 @@ endmacro()
 ## Call vendor macro
 build_mcap_vendor()
 
-ament_export_include_directories(${_mcap_include_dir})
+ament_export_include_directories(include/${PROJECT_NAME})
 ament_export_libraries(${PROJECT_NAME})
 ament_export_targets(${PROJECT_NAME}  HAS_LIBRARY_TARGET)
 ament_export_dependencies(zstd_vendor zstd)
diff --git a/rosbag2_storage_mcap/src/mcap_storage.cpp b/rosbag2_storage_mcap/src/mcap_storage.cpp
index 2306923..9600e4b 100644
--- a/rosbag2_storage_mcap/src/mcap_storage.cpp
+++ b/rosbag2_storage_mcap/src/mcap_storage.cpp
@@ -36,7 +36,7 @@
 #endif
 #endif
 
-#include <mcap/mcap.hpp>
+#include <mcap_vendor/mcap/mcap.hpp>
 
 #include <algorithm>
 #include <filesystem>