diff --git a/.copier-answers.yml b/.copier-answers.yml index ad4cf1e..928bf05 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY -_commit: v0.8.41 +_commit: v0.8.42 _src_path: https://github.com/serious-scaffold/ss-pybind11 author_email: msclock@126.com author_name: l.feng diff --git a/.github/workflows/reuseable_cibuildwheel.yml b/.github/workflows/reuseable_cibuildwheel.yml index eda84c6..aa2ca8a 100644 --- a/.github/workflows/reuseable_cibuildwheel.yml +++ b/.github/workflows/reuseable_cibuildwheel.yml @@ -24,9 +24,9 @@ jobs: build: [manylinux, musllinux] qemu_arch: [aarch64 ppc64le s390x armv7l] include: - - {os: windows-2019, arch: AMD64, build: win} - - {os: windows-2019, arch: x86, build: win} - - {os: windows-2022, arch: ARM64, build: win} + - {os: windows-2025, arch: AMD64, build: win} + - {os: windows-2025, arch: x86, build: win} + - {os: windows-2025, arch: ARM64, build: win} - {os: macos-13, arch: x86_64, build: macos} - {os: macos-14, arch: arm64, build: macos} diff --git a/cmake/vcpkg/bootstrap/vcpkg_bootstrap.cmake b/cmake/vcpkg/bootstrap/vcpkg_bootstrap.cmake index 653b4d5..455fe1b 100644 --- a/cmake/vcpkg/bootstrap/vcpkg_bootstrap.cmake +++ b/cmake/vcpkg/bootstrap/vcpkg_bootstrap.cmake @@ -88,6 +88,13 @@ function(_vcpkg_tool_bootstrap vcpkg_root) string(REPLACE [[elif [ "$ARCH" = "x86_64" ]; then]] [[elif [ "$ARCH" = "" ]; then]] file_contents "${file_contents}") + message(STATUS "Replace vcpkg sources") + string( + REPLACE + [[(cd "$buildDir" && cmake --build .) || exit 1]] + [[(sed -i 's/InternalFeatureSet separate_features{{FeatureNameCore.to_string(), feature->name}};/InternalFeatureSet separate_features{{FeatureNameCore.to_string()}}; separate_features.push_back(feature->name);/' $srcDir/src/vcpkg/commands.test-features.cpp && cd "$buildDir" && cmake --build .) || exit 1]] + file_contents + "${file_contents}") file(WRITE "${bootstrap_impl}" "${file_contents}") execute_process(