diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cd7d91b12c..3fe3ffdd01 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -553,7 +553,7 @@ jobs: id: cache with: path: ./build/release/third_party/install - key: ${{ github.job }}-${{ hashFiles('./third_party/**') }}-2 + key: ${{ github.job }}-${{ hashFiles('./third_party/**') }}-4 - name: disable superbuild on cache hit if: steps.cache.outputs.cache-hit == 'true' run: | diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c4e39f826c..0fd8a6dd72 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -38,6 +38,7 @@ endif() # This will noop if hunter is not enabled hunter_add_package(jsoncpp) hunter_add_package(CURL) +hunter_add_package(lzma) find_package(CURL REQUIRED) find_package(LibLZMA REQUIRED) diff --git a/src/mavsdk/core/CMakeLists.txt b/src/mavsdk/core/CMakeLists.txt index 57f494c0bf..5b6a41c2b5 100644 --- a/src/mavsdk/core/CMakeLists.txt +++ b/src/mavsdk/core/CMakeLists.txt @@ -65,11 +65,7 @@ cmake_policy(SET CMP0079 NEW) target_link_libraries(mavsdk PRIVATE Threads::Threads - ${LIBLZMA_LIBRARIES} -) -target_include_directories(mavsdk - PRIVATE - ${LIBLZMA_INCLUDE_DIRS} + LibLZMA::LibLZMA ) if (NOT BUILD_WITHOUT_CURL)