Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

scripts/msys => scripts/cmake #32375

Merged
merged 4 commits into from
Jul 27, 2023
Merged

scripts/msys => scripts/cmake #32375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a3daec4
scripts/msys => scripts/cmake
BillyONeal Jul 3, 2023
4d94d93
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Jul 18, 2023
290aeec
Merge remote-tracking branch 'origin/master' into move-msys-patch
BillyONeal Jul 26, 2023
f5d1cf7
Expand CMAKE_CURRENT_LIST_DIR in the right place.
BillyONeal Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...s/compile_wrapper_consider_clang-cl.patch → ...e/compile_wrapper_consider_clang-cl.patch
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion scripts/cmake/vcpkg_acquire_msys.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "")
Expand Down Expand Up @@ -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"
Expand Down