fix?

.github/workflows/ros2-humble.yaml

@@ -6,9 +6,24 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
+      # Step 1: Set up ROS
       - uses: ros-tooling/[email protected]
         with:
           required-ros-distributions: humble
+
+      # Step 2: Cache ROS dependencies
+      - name: Cache ROS dependencies
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.ros
+            /tmp/rosdep
+            /opt/ros/humble
+          key: ${{ runner.os }}-ros2-${{ hashFiles('**/package.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-ros2-
+
+      # Step 3: Run ROS CI
       - uses: ros-tooling/[email protected]
         with:
           package-name: plotjuggler

.github/workflows/ros2-rolling.yaml

@@ -6,9 +6,24 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
+      # Step 1: Set up ROS
       - uses: ros-tooling/[email protected]
         with:
           required-ros-distributions: rolling
+
+      # Step 2: Cache ROS dependencies
+      - name: Cache ROS dependencies
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.ros
+            /tmp/rosdep
+            /opt/ros/rolling
+          key: ${{ runner.os }}-ros2-${{ hashFiles('**/package.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-ros2-
+
+      # Step 3: Run ROS CI
       - uses: ros-tooling/[email protected]
         with:
           package-name: plotjuggler

3rdparty/CMakeLists.txt

@@ -18,25 +18,41 @@ CPMAddPackage("gh:nlohmann/[email protected]")
 
 ##### MCAP + compression libs ######
 
-CPMAddPackage("gh:facebook/[email protected]")
-CPMAddPackage("gh:lz4/[email protected]")
+CPMAddPackage(
+    NAME zstd
+    GITHUB_REPOSITORY facebook/zstd
+    GIT_TAG v1.5.6
+    DOWNLOAD_ONLY YES
+)
+file(GLOB ZSTD_SOURCES ${ZSTD_SOURCE_DIR}/lib/*.c)
+add_library(zstd STATIC ${ZSTD_SOURCES})
+target_include_directories(zstd PRIVATE ${ZSTD_SOURCE_DIR}/lib)
+target_sources(zstd PRIVATE ${ZSTD_SOURCES})
 
-find_package(mcap QUIET)
-if (NOT mcap_FOUND)
 
-    CPMAddPackage(
-        NAME mcap
-        GITHUB_REPOSITORY foxglove/mcap
-        GIT_TAG releases/cpp/v2.0.0
-        DOWNLOAD_ONLY YES
-    )
-    # mcap has no CMake support, so we create our own target
-    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()
+CPMAddPackage(
+    NAME lz4
+    GITHUB_REPOSITORY lz4/lz4
+    GIT_TAG v1.10.0
+    DOWNLOAD_ONLY YES
+)
+file(GLOB LZ4_SOURCES ${LZ4_SOURCE_DIR}/lib/*.c)
+add_library(lz4 STATIC ${LZ4_SOURCES})
+target_include_directories(lz4 PRIVATE ${LZ4_SOURCE_DIR}/lib)
+target_sources(lz4 PRIVATE ${LZ4_SOURCES})
+
+
+CPMAddPackage(
+    NAME mcap
+    GITHUB_REPOSITORY foxglove/mcap
+    GIT_TAG releases/cpp/v2.0.0
+    DOWNLOAD_ONLY YES
+)
+# mcap has no CMake support, so we create our own target
+add_library(mcap INTERFACE)
+target_include_directories(mcap INTERFACE "${mcap_SOURCE_DIR}/cpp/mcap/include")
+target_link_libraries(mcap INTERFACE zstd lz4)
+
 
 ##### Lua + Sol2 ######