From 7eb92c68de1bd87645ea736e9271d9e2eca25bc4 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Sun, 24 Dec 2023 14:30:10 +0100 Subject: [PATCH] build: Only fix libarchive include dirs when necessary --- plugins/decompress/CMakeLists.txt | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/plugins/decompress/CMakeLists.txt b/plugins/decompress/CMakeLists.txt index e55bf033b..7ceda0449 100644 --- a/plugins/decompress/CMakeLists.txt +++ b/plugins/decompress/CMakeLists.txt @@ -3,22 +3,19 @@ cmake_minimum_required(VERSION 3.16) include(ImHexPlugin) # Homebrew only ships a libarchive keg, include directories have to be set manually -if (APPLE) - find_package(Brew QUIET) - if (Brew_FOUND) - execute_process( - COMMAND (${BREW_EXECUTABLE} --prefix libarchive) || exit 0 - OUTPUT_VARIABLE LIBARCHIVE_PREFIX - OUTPUT_STRIP_TRAILING_WHITESPACE - COMMAND_ERROR_IS_FATAL ANY - ) +find_package(LibArchive REQUIRED) +if (APPLE AND LibArchive_INCLUDE_DIR STREQUAL "") + execute_process( + COMMAND (${BREW_EXECUTABLE} --prefix libarchive) || exit 0 + OUTPUT_VARIABLE LIBARCHIVE_PREFIX + OUTPUT_STRIP_TRAILING_WHITESPACE + COMMAND_ERROR_IS_FATAL ANY + ) - if (NOT LIBARCHIVE_PREFIX STREQUAL "") - set(LibArchive_INCLUDE_DIR "${LIBARCHIVE_PREFIX}/include") - endif() + if (NOT LIBARCHIVE_PREFIX STREQUAL "") + set(LibArchive_INCLUDE_DIR "${LIBARCHIVE_PREFIX}/include") endif() endif() -find_package(LibArchive REQUIRED) add_imhex_plugin( NAME