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

build(cmake): correctly find libarchive on Apple-M series #1607

Closed
wants to merge 1 commit into from
Closed

build(cmake): correctly find libarchive on Apple-M series #1607

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 13 additions & 7 deletions src/libs/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,21 @@ else()
target_link_libraries(Core Qt5::WebEngine)
endif()

find_package(LibArchive REQUIRED)

# Set LibArchive_INCLUDE_DIR on macOS when LibArchive is installed with Homebrew.
# See https://github.com/Homebrew/legacy-homebrew/issues/21415.
if(APPLE AND NOT LibArchive_INCLUDE_DIR)
set(LibArchive_INCLUDE_DIR "/usr/local/opt/libarchive/include")
find_package(LibArchive QUIET)
if(NOT LibArchive_FOUND)
find_path(LibArchive_INCLUDE_DIRS archive.h
PATHS /opt/homebrew/opt/libarchive/include /usr/local/opt/libarchive/include
REQUIRED
)
find_library(LibArchive_LIBRARIES
NAMES archive libarchive
PATHS /opt/homebrew/opt/libarchive/lib /usr/local/opt/libarchive/lib
REQUIRED
NO_DEFAULT_PATH
)
endif()

if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.17.0)
if((CMAKE_VERSION VERSION_GREATER_EQUAL 3.17.0) AND (TARGET LibArchive::LibArchive))
target_link_libraries(Core LibArchive::LibArchive)
else()
include_directories(${LibArchive_INCLUDE_DIRS})
Expand Down