--- a/CMakeLists.txt 2026-07-26 12:23:17.000000000 +0800 +++ b/CMakeLists.txt 2026-08-05 17:40:54.000000000 +0800 @@ -184,8 +184,7 @@ # zlib ExternalProject_Add(zlib - URL "${ZLIB_URL}" - URL_HASH "${ZLIB_URL_HASH}" + DOWNLOAD_COMMAND "" SOURCE_DIR "${DEPS_SRC_DIR}/zlib" BINARY_DIR "${DEPS_BUILD_DIR}/zlib" INSTALL_DIR "${DEPS_INSTALL_DIR}" @@ -199,8 +198,7 @@ # zstd ExternalProject_Add(zstd - URL "${ZSTD_URL}" - URL_HASH "${ZSTD_URL_HASH}" + DOWNLOAD_COMMAND "" SOURCE_DIR "${DEPS_SRC_DIR}/zstd" BINARY_DIR "${DEPS_BUILD_DIR}/zstd" INSTALL_DIR "${DEPS_INSTALL_DIR}" @@ -219,8 +217,7 @@ # brotli _track_external_project_patch(brotli _brotli_patch_file _brotli_patch_changed) ExternalProject_Add(brotli - URL "${BROTLI_URL}" - URL_HASH "${BROTLI_URL_HASH}" + DOWNLOAD_COMMAND "" SOURCE_DIR "${DEPS_SRC_DIR}/brotli" BINARY_DIR "${DEPS_BUILD_DIR}/brotli" INSTALL_DIR "${DEPS_INSTALL_DIR}" @@ -263,8 +260,7 @@ boringssl _boringssl_patch_file _boringssl_patch_changed ) ExternalProject_Add(boringssl - URL "${BORINGSSL_URL}" - URL_HASH "${BORINGSSL_URL_HASH}" + DOWNLOAD_COMMAND "" SOURCE_DIR "${DEPS_SRC_DIR}/boringssl" BINARY_DIR "${DEPS_BUILD_DIR}/boringssl" PATCH_COMMAND ${PATCH_EXE} -p1 -i "${_boringssl_patch_file}" @@ -292,8 +288,7 @@ # nghttp2 ExternalProject_Add(nghttp2 - URL "${NGHTTP2_URL}" - URL_HASH "${NGHTTP2_URL_HASH}" + DOWNLOAD_COMMAND "" SOURCE_DIR "${DEPS_SRC_DIR}/nghttp2" BINARY_DIR "${DEPS_BUILD_DIR}/nghttp2" INSTALL_DIR "${DEPS_INSTALL_DIR}" @@ -314,8 +309,7 @@ # nghttp3 _track_external_project_patch(nghttp3 _nghttp3_patch_file _nghttp3_patch_changed) ExternalProject_Add(nghttp3 - URL "${NGHTTP3_URL}" - URL_HASH "${NGHTTP3_URL_HASH}" + DOWNLOAD_COMMAND "" SOURCE_DIR "${DEPS_SRC_DIR}/nghttp3" BINARY_DIR "${DEPS_BUILD_DIR}/nghttp3" INSTALL_DIR "${DEPS_INSTALL_DIR}" @@ -347,8 +341,7 @@ endif() ExternalProject_Add(ngtcp2 LIST_SEPARATOR | - URL "${NGTCP2_URL}" - URL_HASH "${NGTCP2_URL_HASH}" + DOWNLOAD_COMMAND "" SOURCE_DIR "${DEPS_SRC_DIR}/ngtcp2" BINARY_DIR "${DEPS_BUILD_DIR}/ngtcp2" INSTALL_DIR "${DEPS_INSTALL_DIR}" @@ -473,8 +466,8 @@ endif() if(APPLE) list(APPEND _curl_staged_dependency_args - "-DCMAKE_IGNORE_PREFIX_PATH=/usr/local|/opt/homebrew" - "-DCMAKE_IGNORE_PATH=/usr/local/include|/usr/local/lib|/opt/homebrew/include|/opt/homebrew/lib" + "-DCMAKE_IGNORE_PREFIX_PATH=@PREFIX@" + "-DCMAKE_IGNORE_PATH=@PREFIX@/include|@PREFIX@/lib" ) endif() if(USE_LIBIDN2 AND NOT WIN32) @@ -497,8 +490,6 @@ else() list(APPEND _curl_platform_flags "-Dssize_t=long") endif() -elseif(APPLE) - list(APPEND _curl_platform_flags -DUSE_APPLE_SECTRUST=ON) endif() if(CMAKE_MSVC_RUNTIME_LIBRARY) list(APPEND _curl_platform_flags "-DCMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY}") @@ -514,6 +505,15 @@ string(STRIP "${_curl_shared_linker_flags}" _curl_shared_linker_flags) list(APPEND _curl_platform_flags "-DCMAKE_EXE_LINKER_FLAGS=${_curl_exe_linker_flags}") list(APPEND _curl_platform_flags "-DCMAKE_SHARED_LINKER_FLAGS=${_curl_shared_linker_flags}") +elseif(APPLE) + set(_curl_exe_linker_flags "${CMAKE_EXE_LINKER_FLAGS}") + set(_curl_shared_linker_flags "${CMAKE_SHARED_LINKER_FLAGS}") + string(APPEND _curl_exe_linker_flags " -l${CURL_IMPERSONATE_CXX_RUNTIME_LIBRARY}") + string(APPEND _curl_shared_linker_flags " -l${CURL_IMPERSONATE_CXX_RUNTIME_LIBRARY}") + string(STRIP "${_curl_exe_linker_flags}" _curl_exe_linker_flags) + string(STRIP "${_curl_shared_linker_flags}" _curl_shared_linker_flags) + list(APPEND _curl_platform_flags "-DCMAKE_EXE_LINKER_FLAGS=${_curl_exe_linker_flags}") + list(APPEND _curl_platform_flags "-DCMAKE_SHARED_LINKER_FLAGS=${_curl_shared_linker_flags}") endif() set(_curl_openssl_flags) @@ -539,8 +539,7 @@ ExternalProject_Add(curl LIST_SEPARATOR | - URL "${CURL_URL}" - URL_HASH "${CURL_URL_HASH}" + DOWNLOAD_COMMAND "" SOURCE_DIR "${DEPS_SRC_DIR}/curl" BINARY_DIR "${DEPS_BUILD_DIR}/curl" INSTALL_DIR "${CMAKE_INSTALL_PREFIX}"