Install zstd in an alternate directory (ros2#1172)

This prevents the compiled libzstd from being used by the host's cmake executable Signed-off-by: Juan Pablo Samper <[email protected]>
jpsamper2009 · Nov 23, 2022 · cf10bb2 · cf10bb2
1 parent 6deee3f
commit cf10bb2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/zstd_vendor/CMakeLists.txt b/zstd_vendor/CMakeLists.txt
@@ -52,7 +52,7 @@ macro(build_zstd)
 
   install(
     DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_install/
-    DESTINATION ${CMAKE_INSTALL_PREFIX}
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/opt/zstd_vendor
     USE_SOURCE_PERMISSIONS)
 endmacro()
 
@@ -64,4 +64,4 @@ endif()
 
 install(DIRECTORY cmake DESTINATION share/${PROJECT_NAME})
 
-ament_package(CONFIG_EXTRAS zstd_vendor-extras.cmake)
+ament_package(CONFIG_EXTRAS zstd_vendor-extras.cmake.in)
diff --git a/zstd_vendor/zstd_vendor-extras.cmake b/zstd_vendor/zstd_vendor-extras.cmake
diff --git a/zstd_vendor/zstd_vendor-extras.cmake.in b/zstd_vendor/zstd_vendor-extras.cmake.in
@@ -0,0 +1,5 @@
+if(NOT DEFINED ENV{zstd_ROOT_DIR})
+  set(zstd_ROOT_DIR "${@PROJECT_NAME@_DIR}/../../../opt/zstd_vendor")
+endif()
+
+list(INSERT CMAKE_MODULE_PATH 0 "${zstd_vendor_DIR}/Modules")