Skip to content

Commit 8ae94d4

Browse files
committed
Codefix f719fa6: [CI] Also apply CMake fix to normal CI
1 parent 2f36e3e commit 8ae94d4

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

.github/workflows/ci-macos.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,10 @@ jobs:
7171
cd build
7272
7373
echo "::group::CMake"
74-
cmake .. \
74+
# CMake 4.0.0 deprecated < 3.5, but some vcpkg packages still use it.
75+
# Yet, they are fully compatible with 3.5, and so there is no problem
76+
# forcing them to upgrade.
77+
CMAKE_POLICY_VERSION_MINIMUM=3.5 cmake .. \
7578
-DCMAKE_OSX_ARCHITECTURES=${{ inputs.full_arch }} \
7679
-DVCPKG_TARGET_TRIPLET=${{ inputs.arch }}-osx \
7780
-DCMAKE_TOOLCHAIN_FILE=${{ runner.temp }}/vcpkg/scripts/buildsystems/vcpkg.cmake \

.github/workflows/ci-windows.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,10 @@ jobs:
6666
cd build
6767
6868
echo "::group::CMake"
69-
cmake .. \
69+
# CMake 4.0.0 deprecated < 3.5, but some vcpkg packages still use it.
70+
# Yet, they are fully compatible with 3.5, and so there is no problem
71+
# forcing them to upgrade.
72+
CMAKE_POLICY_VERSION_MINIMUM=3.5 VCPKG_ENV_PASSTHROUGH=CMAKE_POLICY_VERSION_MINIMUM cmake .. \
7073
-GNinja \
7174
-DVCPKG_TARGET_TRIPLET=${{ inputs.arch }}-windows-static \
7275
-DCMAKE_TOOLCHAIN_FILE="${{ runner.temp }}\vcpkg\scripts\buildsystems\vcpkg.cmake" \

.github/workflows/release-windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
# CMake 4.0.0 deprecated < 3.5, but some vcpkg packages still use it.
8888
# Yet, they are fully compatible with 3.5, and so there is no problem
8989
# forcing them to upgrade.
90-
CMAKE_POLICY_VERSION_MINIMUM=3.5 cmake ${GITHUB_WORKSPACE} \
90+
CMAKE_POLICY_VERSION_MINIMUM=3.5 VCPKG_ENV_PASSTHROUGH=CMAKE_POLICY_VERSION_MINIMUM cmake ${GITHUB_WORKSPACE} \
9191
-GNinja \
9292
-DOPTION_TOOLS_ONLY=ON \
9393
-DCMAKE_BUILD_TYPE=RelWithDebInfo \

0 commit comments

Comments
 (0)