Browse Source

libarchive: Set build options the way we need for CMake

Brad King 2 years ago
parent
commit
ba5ced1be6
2 changed files with 5 additions and 1 deletions
  1. 1 1
      Source/Modules/CMakeBuildUtilities.cmake
  2. 4 0
      Utilities/cmlibarchive/CMakeLists.txt

+ 1 - 1
Source/Modules/CMakeBuildUtilities.cmake

@@ -279,7 +279,7 @@ else()
   set(ENABLE_LIBXML2 OFF)
   set(ENABLE_EXPAT OFF)
   set(ENABLE_PCREPOSIX OFF)
-  set(ENABLE_LibGCC OFF)
+  set(ENABLE_LIBGCC OFF)
   set(ENABLE_CNG OFF)
   set(ENABLE_TAR OFF)
   set(ENABLE_TAR_SHARED OFF)

+ 4 - 0
Utilities/cmlibarchive/CMakeLists.txt

@@ -636,10 +636,12 @@ IF(ENABLE_ZSTD)
     SET(ZSTD_FIND_QUIETLY TRUE)
   ENDIF (ZSTD_INCLUDE_DIR)
 
+  IF(0) # CMake does not let pkg-config override its search paths.
   IF(UNIX)
     FIND_PACKAGE(PkgConfig QUIET)
     PKG_SEARCH_MODULE(PC_ZSTD libzstd)
   ENDIF()
+  ENDIF()
 
   FIND_PATH(ZSTD_INCLUDE_DIR zstd.h HINTS ${PC_ZSTD_INCLUDEDIR} ${PC_ZSTD_INCLUDE_DIRS})
   FIND_LIBRARY(ZSTD_LIBRARY NAMES zstd libzstd HINTS ${PC_ZSTD_LIBDIR} ${PC_ZSTD_LIBRARY_DIRS})
@@ -2006,6 +2008,7 @@ CHECK_CRYPTO("MD5;RMD160;SHA1;SHA256;SHA512" LIBMD)
 
 CHECK_CRYPTO_WIN("MD5;SHA1;SHA256;SHA384;SHA512")
 
+IF(0) # CMake does not build libarchive's shared library.
 # Check visibility annotations
 SET(OLD_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
 SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fvisibility=hidden -Werror")
@@ -2016,6 +2019,7 @@ IF (HAVE_VISIBILITY_ATTR)
   ADD_DEFINITIONS(-D__LIBARCHIVE_ENABLE_VISIBILITY)
 ENDIF(HAVE_VISIBILITY_ATTR)
 SET(CMAKE_REQUIRED_FLAGS "${OLD_CMAKE_REQUIRED_FLAGS}")
+ENDIF()
 
 # Generate "config.h" from "build/cmake/config.h.in"
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/config.h.in