From 9926cdee0b35ac9a139504e295ecf1bb0883cb9d Mon Sep 17 00:00:00 2001 From: Georg Hagen Date: Sun, 26 May 2024 23:44:31 +0200 Subject: [PATCH] Build libarchive unless USE_SYSTEM_LIB_ARCHIVE is set --- 3rdParty/CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/3rdParty/CMakeLists.txt b/3rdParty/CMakeLists.txt index b5dfb46..7725616 100644 --- a/3rdParty/CMakeLists.txt +++ b/3rdParty/CMakeLists.txt @@ -17,7 +17,7 @@ add_subdirectory(tracy) add_subdirectory(libstud-uuid) add_subdirectory(rapidyaml) -if (NOT LINUX) +if (NOT USE_SYSTEM_LIB_ARCHIVE) file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/deps) execute_process( COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} -DTOOLCHAIN_FILE=${TOOLCHAIN_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/libarchive @@ -26,9 +26,8 @@ execute_process( execute_process( COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}/deps ) - list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/deps/INSTALL) -endif() +endif () function(LinkLibArchive TARGET) find_package(LibArchive REQUIRED)