Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmake: improve LibLZMA linking #2296

Merged
merged 3 commits into from
May 8, 2024
Merged

cmake: improve LibLZMA linking #2296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
410a3b1
CI: MSVC invalidate cache
julianoes May 8, 2024
85fb8c8
cmake: use new way of linking to LibLZMA
julianoes May 8, 2024
4780967
cmake: add hunter for LibLZMA
julianoes May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
1 change: 1 addition & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 1 addition & 5 deletions src/mavsdk/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep this looks a lot better 👍

)

if (NOT BUILD_WITHOUT_CURL)
Expand Down
Loading