From a0fddd2953fd4ccbad71140d47398feae61e45f7 Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Wed, 27 Dec 2023 00:38:32 +0100
Subject: [PATCH] build: Try detecting macOS better when updating libarchive
 include path

---
 plugins/decompress/CMakeLists.txt | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/plugins/decompress/CMakeLists.txt b/plugins/decompress/CMakeLists.txt
index 6674a9c0f..093c540ad 100644
--- a/plugins/decompress/CMakeLists.txt
+++ b/plugins/decompress/CMakeLists.txt
@@ -3,21 +3,16 @@ cmake_minimum_required(VERSION 3.16)
 include(ImHexPlugin)
 
 # Homebrew only ships a libarchive keg, include directories have to be set manually
-find_package(LibArchive)
-if (NOT DEFINED LibArchive_INCLUDE_DIR OR LibArchive_INCLUDE_DIR STREQUAL "")
-    if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-        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()
-    endif()
+if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Darwin")
+    execute_process(
+            COMMAND brew --prefix libarchive
+            OUTPUT_VARIABLE LIBARCHIVE_PREFIX
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+            COMMAND_ERROR_IS_FATAL ANY
+    )
+    set(LibArchive_INCLUDE_DIR "${LIBARCHIVE_PREFIX}/include")
 endif()
+find_package(LibArchive REQUIRED)
 
 add_imhex_plugin(
     NAME