diff --git a/scripts/msys/compile_wrapper_consider_clang-cl.patch b/scripts/cmake/compile_wrapper_consider_clang-cl.patch similarity index 100% rename from scripts/msys/compile_wrapper_consider_clang-cl.patch rename to scripts/cmake/compile_wrapper_consider_clang-cl.patch diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index 736d463238b802..546281af5fecd9 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -249,6 +249,8 @@ This can be resolved by explicitly passing URL/SHA pairs to DIRECT_PACKAGES.") set("${out_msys_root}" "${path_to_root}" PARENT_SCOPE) endfunction() +# Expand this while CMAKE_CURRENT_LIST_DIR is for this file. +set(Z_VCPKG_AUTOMAKE_CLANG_CL_PATCH "${CMAKE_CURRENT_LIST_DIR}/compile_wrapper_consider_clang-cl.patch") macro(z_vcpkg_acquire_msys_declare_all_packages) set(Z_VCPKG_MSYS_PACKAGES_AVAILABLE "" CACHE INTERNAL "") @@ -283,7 +285,7 @@ macro(z_vcpkg_acquire_msys_declare_all_packages) URL "https://mirror.msys2.org/msys/x86_64/automake1.16-1.16.5-1-any.pkg.tar.zst" SHA512 62c9dfe28d6f1d60310f49319723862d29fc1a49f7be82513a4bf1e2187ecd4023086faf9914ddb6701c7c1e066ac852c0209db2c058f3865910035372a4840a DEPS bash perl - PATCHES "${SCRIPTS}/msys/compile_wrapper_consider_clang-cl.patch" + PATCHES "${Z_VCPKG_AUTOMAKE_CLANG_CL_PATCH}" ) z_vcpkg_acquire_msys_declare_package( URL "https://mirror.msys2.org/msys/x86_64/bash-5.2.015-1-x86_64.pkg.tar.zst"