mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 01:59:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

scripts/msys => scripts/cmake (#32375)

Browse Source 
* scripts/msys => scripts/cmake

The "msys" directory looked like a "maintainer help" directory (like scripts/boost is) so it wasn't included in standalone distributions of vcpkg.

It seems like the correct fix for this is just to move it into the scripts/cmake directory.
This commit is contained in:
Billy O'Neal 2023-07-27 13:19:40 -07:00 committed by GitHub
parent 8184c5e06c
commit 08f00b4f01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
scripts/msys/compile_wrapper_consider_clang-cl.patch → scripts/cmake/compile_wrapper_consider_clang-cl.patch
View File

4
scripts/cmake/vcpkg_acquire_msys.cmake
View File

@ -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"