From ff95dc7f449e31c7ccf789bdb1c8e903ed376561 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 26 Sep 2025 16:38:08 -0400 Subject: [PATCH] libarchive: Set build options the way we need for CMake --- Source/Modules/CMakeBuildUtilities.cmake | 1 + Utilities/cmlibarchive/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Source/Modules/CMakeBuildUtilities.cmake b/Source/Modules/CMakeBuildUtilities.cmake index 5c21fff8d8..da6781981c 100644 --- a/Source/Modules/CMakeBuildUtilities.cmake +++ b/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) diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt index fd3314eb24..9957052dde 100644 --- a/Utilities/cmlibarchive/CMakeLists.txt +++ b/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.