From 410a3b13945fe41469255ff1bc7cd5bf44ad9586 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Wed, 8 May 2024 20:24:25 +1200 Subject: [PATCH 1/3] CI: MSVC invalidate cache Let's check this for sanity. Signed-off-by: Julian Oes --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: | From 85fb8c88e71fc5c92ad7848b0ec984523643b808 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Thu, 9 May 2024 08:22:13 +1200 Subject: [PATCH 2/3] cmake: use new way of linking to LibLZMA Signed-off-by: Julian Oes --- src/mavsdk/core/CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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) From 478096729aed29880276ca578de412b0a5f7673b Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Thu, 9 May 2024 08:48:27 +1200 Subject: [PATCH 3/3] cmake: add hunter for LibLZMA Signed-off-by: Julian Oes --- src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) 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)