Browse Source

libarchive: Set build options the way we need for CMake

Brad King 3 weeks ago
parent
commit
ff95dc7f44
2 changed files with 3 additions and 0 deletions
  1. 1 0
      Source/Modules/CMakeBuildUtilities.cmake
  2. 2 0
      Utilities/cmlibarchive/CMakeLists.txt

+ 1 - 0
Source/Modules/CMakeBuildUtilities.cmake

@@ -290,6 +290,7 @@ else()
   set(ENABLE_CAT_SHARED OFF)
   set(ENABLE_UNZIP OFF)
   set(ENABLE_UNZIP_SHARED OFF)
+  set(ENABLE_WIN32_XMLLITE OFF)
   set(ENABLE_XATTR OFF)
   set(ENABLE_ACL OFF)
   set(ENABLE_ICONV OFF)

+ 2 - 0
Utilities/cmlibarchive/CMakeLists.txt

@@ -98,8 +98,10 @@ set(MACHO_CURRENT_VERSION "${MACHO_COMPATIBILITY_VERSION}.${_revision}")
 # saving and restoring the state of the variables.
 INCLUDE(${CMake_SOURCE_DIR}/Modules/CMakePushCheckState.cmake)
 
+if(0) # XXX(cmake): do not let pkg-config override our search paths
 # Enable the pkg-config helpers.
 INCLUDE(FindPkgConfig)
+endif() # XXX(cmake): end
 
 # Initialize the state of the variables. This initialization is not
 # necessary but this shows you what value the variables initially have.