ci: Rely on cmake --preset toolchain file

This is the standard approach and avoids relying on
VCPKG_INSTALLATION_ROOT and -DCMAKE_TOOLCHAIN_FILE= in the ci-windows.py
script.

This makes it easier to run locally.
This commit is contained in:
MarcoFalke
2026-02-06 16:45:04 +01:00
parent fa3f89acaa
commit fa9627af9f
2 changed files with 4 additions and 7 deletions

View File

@@ -39,12 +39,6 @@ GENERATE_OPTIONS = {
def generate(ci_type):
toolchain_file = os.path.join(
os.environ["VCPKG_INSTALLATION_ROOT"],
"scripts",
"buildsystems",
"vcpkg.cmake",
)
command = [
"cmake",
"-B",
@@ -52,7 +46,6 @@ def generate(ci_type):
"-Werror=dev",
"--preset",
"vs2022",
f"-DCMAKE_TOOLCHAIN_FILE={toolchain_file}",
] + GENERATE_OPTIONS[ci_type]
run(command)

View File

@@ -255,6 +255,10 @@ jobs:
# Workaround for libevent, which requires CMake 3.1 but is incompatible with CMake >= 4.0.
sed -i '1s/^/set(ENV{CMAKE_POLICY_VERSION_MINIMUM} 3.5)\n/' "${VCPKG_INSTALLATION_ROOT}/scripts/ports.cmake"
- name: Set VCPKG_ROOT
run: |
echo "VCPKG_ROOT=${VCPKG_INSTALLATION_ROOT}" >> "$GITHUB_ENV"
- name: vcpkg tools cache
uses: actions/cache@v5
with: