Switch to using the vendored zstd library.

We already have it vendored in the core as necessary.

Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>

mcap_vendor/CMakeLists.txt

@@ -13,6 +13,8 @@ endif()
 
 ## Dependencies
 find_package(ament_cmake REQUIRED)
+find_package(zstd_vendor REQUIRED)
+find_package(zstd REQUIRED)
 
 
 ## Define vendor macro
@@ -30,39 +32,25 @@ macro(build_mcap_vendor)
   )
   fetchcontent_makeavailable(lz4)
 
-  fetchcontent_declare(zstd
-    GIT_REPOSITORY https://github.com/facebook/zstd.git
-    GIT_TAG e47e674cd09583ff0503f0f6defd6d23d8b718d3 # v1.5.2
-  )
-  fetchcontent_makeavailable(zstd)
-
-  file(GLOB _zstd_srcs
-    ${zstd_SOURCE_DIR}/lib/common/*.c
-    ${zstd_SOURCE_DIR}/lib/compress/*.c
-    ${zstd_SOURCE_DIR}/lib/decompress/*.c
-    ${zstd_SOURCE_DIR}/lib/decompress/*.S
-  )
-
   file(GLOB _lz4_srcs
     ${lz4_SOURCE_DIR}/lib/*.c)
 
   add_library(
     mcap SHARED
     src/main.cpp
-    ${_zstd_srcs}
     ${_lz4_srcs}
   )
 
   set(_mcap_include_dir ${mcap_SOURCE_DIR}/cpp/mcap/include)
 
   target_include_directories(mcap SYSTEM PRIVATE
     ${lz4_SOURCE_DIR}/lib
-    ${zstd_SOURCE_DIR}/lib
   )
   target_include_directories(mcap SYSTEM PUBLIC
     "$<BUILD_INTERFACE:${_mcap_include_dir}>"
     "$<INSTALL_INTERFACE:include>"
   )
+  target_link_libraries(mcap PRIVATE zstd::zstd)
 
   install(
     DIRECTORY

mcap_vendor/package.xml

@@ -9,7 +9,9 @@
 
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>git</buildtool_depend>
-
+
+  <depend>zstd_vendor</depend>
+
   <test_depend>ament_cmake_clang_format</test_depend>
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>