try again

facontidavide · Jan 19, 2025 · 04c1e16 · 04c1e16
1 parent 62931ca
commit 04c1e16
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/.github/workflows/ros2-humble.yaml b/.github/workflows/ros2-humble.yaml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: ros-tooling/[email protected]
         with:

diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
@@ -18,15 +18,8 @@ CPMAddPackage("gh:nlohmann/[email protected]")
 
 ##### MCAP + compression libs ######
 
-find_package(zstd QUIET)
-if (NOT zstd_FOUND)
-    CPMAddPackage("gh:facebook/[email protected]")
-endif()
-
-find_package(lz4 QUIET)
-if (NOT lz4_FOUND)
-    CPMAddPackage("gh:lz4/[email protected]")
-endif()
+CPMAddPackage("gh:facebook/[email protected]")
+CPMAddPackage("gh:lz4/[email protected]")
 
 find_package(mcap QUIET)
 if (NOT mcap_FOUND)
@@ -41,6 +34,7 @@ if (NOT mcap_FOUND)
     if (mcap_ADDED)
         add_library(mcap INTERFACE)
         target_include_directories(mcap INTERFACE "${mcap_SOURCE_DIR}/cpp/mcap/include")
+        target_link_libraries(mcap INTERFACE zstd lz4)
     endif()
 endif()
 

diff --git a/package.xml b/package.xml
@@ -29,10 +29,6 @@
     <depend>boost</depend>
     <depend>libzmq3-dev</depend>
 
-    <!-- needed for MCAP -->
-    <depend>lz4</depend>
-    <depend>libzstd-dev</depend>
-
     <depend>protobuf-dev</depend>
 
     <!-- The export tag contains other, unspecified, tags -->
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ on: [push, pull_request] @@
     jobs:
       build:
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         steps:
           - uses: ros-tooling/[email protected]
             with:
@@ Expand Down @@