Install mcap headers in include/${PROJECT_NAME}/mcap and export them

Signed-off-by: Michael Orlov <[email protected]>
ros-tooling · Oct 26, 2022 · f3606f9 · f3606f9
1 parent ddd028b
commit f3606f9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -36,7 +36,7 @@
 #endif
 #endif
 
-#include <mcap/mcap.hpp>
+#include <mcap_vendor/mcap/mcap.hpp>
 
 #include <algorithm>
 #include <filesystem>