From: Gregor Jasny Date: Wed, 7 Jun 2023 19:11:07 +0000 (+0200) Subject: build: Fix Xcode build of zstd (#1296) X-Git-Tag: v4.8.2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef9f5e14c4a6bfaa2b33427c5234ae045761d981;p=thirdparty%2Fccache.git build: Fix Xcode build of zstd (#1296) Reproducer (CMake 3.26.4, Xcode 14.3): cmake -B _build -GXcode -DCMAKE_OSX_ARCHITECTURES=x86_64 \ -DZSTD_FROM_INTERNET=ON -DREDIS_STORAGE_BACKEND=OFF cmake --build _build See facebook/zstd#3622 --- diff --git a/cmake/Findzstd.cmake b/cmake/Findzstd.cmake index dd18b7722..14aeda5c2 100644 --- a/cmake/Findzstd.cmake +++ b/cmake/Findzstd.cmake @@ -57,6 +57,11 @@ if(do_download) set(zstd_dir ${CMAKE_BINARY_DIR}/zstd-${zstd_version}) set(zstd_build ${CMAKE_BINARY_DIR}/zstd-build) + if(XCODE) + # See https://github.com/facebook/zstd/pull/3665 + set(zstd_patch PATCH_COMMAND sed -i .bak -e s/^set_source_files_properties.*PROPERTIES.*LANGUAGE.*C/\#&/ build/cmake/lib/CMakeLists.txt) + endif() + include(FetchContent) FetchContent_Declare( zstd @@ -64,6 +69,7 @@ if(do_download) URL_HASH SHA256=9c4396cc829cfae319a6e2615202e82aad41372073482fce286fac78646d3ee4 SOURCE_DIR ${zstd_dir} BINARY_DIR ${zstd_build} + ${zstd_patch} ) FetchContent_GetProperties(zstd)