From dc0cd6fcd98f802044445b4902e931d381e939df Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Mon, 3 Jul 2023 20:18:37 +0200 Subject: [PATCH] Remove local libarchive build (except for static builds) --- CMakeLists.txt | 21 --------------------- CMakeLists.txt.libarchive | 18 ------------------ 2 files changed, 39 deletions(-) delete mode 100644 CMakeLists.txt.libarchive diff --git a/CMakeLists.txt b/CMakeLists.txt index 390aae5c..c967f678 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,6 @@ option(WITH_BENCHMARKS "build with benchmarks" OFF) option(ENABLE_PERFMON "enable performance monitor in all tools" ON) if(WIN32) set(PREFER_SYSTEM_LIBFMT ON) - set(PREFER_SYSTEM_LIBARCHIVE ON) set(PREFER_SYSTEM_ZSTD ON) set(PREFER_SYSTEM_XXHASH ON) else() @@ -41,7 +40,6 @@ else() option(ENABLE_COVERAGE "enable code coverage" OFF) option(USE_JEMALLOC "build with jemalloc" ON) option(PREFER_SYSTEM_LIBFMT "use system libfmt if available" OFF) - option(PREFER_SYSTEM_LIBARCHIVE "use system libarchive if available" OFF) option(PREFER_SYSTEM_ZSTD "use system zstd if available" OFF) option(PREFER_SYSTEM_XXHASH "use system xxHash if available" OFF) option(PREFER_SYSTEM_GTEST "use system gtest if available" OFF) @@ -197,25 +195,6 @@ else() find_package(fmt 10.0 REQUIRED CONFIG PATHS "${CMAKE_CURRENT_BINARY_DIR}/fmtlib-install" NO_DEFAULT_PATH) endif() -if(NOT PREFER_SYSTEM_LIBARCHIVE) - configure_file(CMakeLists.txt.libarchive libarchive-download/CMakeLists.txt) - execute_process( - COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . - RESULT_VARIABLE result - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/libarchive-download) - if(result) - message(FATAL_ERROR "CMake step for libarchive failed: ${result}") - endif() - execute_process( - COMMAND ${CMAKE_COMMAND} --build . - RESULT_VARIABLE result - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/libarchive-download) - if(result) - message(FATAL_ERROR "Build step for libarchive failed: ${result}") - endif() - set(CMAKE_PREFIX_PATH "${CMAKE_CURRENT_BINARY_DIR}/libarchive-install;${CMAKE_PREFIX_PATH}") -endif() - list(APPEND DWARFS_BOOST_MODULES chrono iostreams program_options) if(WITH_PYTHON) diff --git a/CMakeLists.txt.libarchive b/CMakeLists.txt.libarchive deleted file mode 100644 index 6848941d..00000000 --- a/CMakeLists.txt.libarchive +++ /dev/null @@ -1,18 +0,0 @@ -cmake_minimum_required(VERSION 3.13.4) - -project(libarchive-download NONE) - -include(ExternalProject) - -ExternalProject_Add( - libarchive - PREFIX ${CMAKE_CURRENT_BINARY_DIR}/libarchive - GIT_REPOSITORY ${LIBARCHIVE_GIT_REPO} - GIT_TAG "v3.6.2" - CMAKE_ARGS -DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} - -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER} - -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/libarchive-install - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DENABLE_ICONV:BOOL=OFF - -DENABLE_LIBXML2:BOOL=OFF -)