Skip to content

chore(deps): update https://github.com/microsoft/vcpkg digest to 984f923 #102

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

chore(deps): update https://github.com/microsoft/vcpkg digest to 984f923 #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b1f6ed8
chore(deps): update https://github.com/microsoft/vcpkg digest to 984f923
serious-scaffold[bot] Jun 7, 2025
b0222ab
use system binary
msclock May 9, 2025
8d7f429
manual update baseline of vcpkg
msclock Jun 19, 2025
fbd8289
exclude i686
msclock Jun 19, 2025
88500ea
manual fix under build from vcpkg source
msclock Jun 19, 2025
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
7 changes: 7 additions & 0 deletions cmake/vcpkg/bootstrap/vcpkg_bootstrap.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,9 @@ before-build = [
]

[[tool.cibuildwheel.overrides]]
select = "*linux_{aarch64,armv7l,ppc64le,s390x}"
select = "*linux_{aarch64,armv7l,ppc64le,s390x,x86_64,i686}"
environment = { VCPKG_FORCE_SYSTEM_BINARIES = "1" }
inherit.environment = "append"

[tool.pytest.ini_options]
minversion = "6.0"
Expand Down
7 changes: 7 additions & 0 deletions template/cmake/vcpkg/bootstrap/vcpkg_bootstrap.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
3 changes: 2 additions & 1 deletion template/pyproject.toml.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,9 @@ before-build = [
]

[[tool.cibuildwheel.overrides]]
select = "*linux_{aarch64,armv7l,ppc64le,s390x}"
select = "*linux_{aarch64,armv7l,ppc64le,s390x,x86_64,i686}"
environment = { VCPKG_FORCE_SYSTEM_BINARIES = "1" }
inherit.environment = "append"

[tool.pytest.ini_options]
minversion = "6.0"
Expand Down
2 changes: 1 addition & 1 deletion template/vcpkg.json.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "{{ ss_cmake_repo_name }}",
"description": "{{ ss_cmake_project_description }}",
"builtin-baseline": "65be7019941e1401e02daaba0738cab2c8a4a355",
"builtin-baseline": "ef7dbf94b9198bc58f45951adcf1f041fcbc5ea0",
"homepage": "https://{{ ss_cmake_repo_url }}",
"dependencies": [
[%- if compiled == true %]
Expand Down
2 changes: 1 addition & 1 deletion vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "ss-pybind11",
"description": "A template of serious scaffold family based on pybind11.",
"builtin-baseline": "65be7019941e1401e02daaba0738cab2c8a4a355",
"builtin-baseline": "ef7dbf94b9198bc58f45951adcf1f041fcbc5ea0",
"homepage": "https://github.com/serious-scaffold/ss-pybind11",
"dependencies": [
"pybind11",
Expand Down
Loading