From 48f84dab30cfc4c324b6e433f1ecf534c44ef01e Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Mon, 3 Jul 2023 21:14:50 +0200 Subject: [PATCH] Update libarchive version and inherit ccache / build type --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c967f678..fbcd8b80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -928,10 +928,12 @@ if(STATIC_BUILD_DO_NOT_USE) ${_LIBARCHIVE_PRJ} PREFIX "${PROJECT_BINARY_DIR}/libarchive" GIT_REPOSITORY ${LIBARCHIVE_GIT_REPO} - GIT_TAG "v3.6.1" + GIT_TAG "v3.6.2" CMAKE_ARGS ${_LIBARCHIVE_CMAKE_ARGS} + -DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} + -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER} -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR}/libarchive - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DENABLE_ICONV:BOOL=OFF -DENABLE_LIBXML2:BOOL=OFF BUILD_BYPRODUCTS ${__LIBARCHIVE}