Skip to content

Commit

Permalink
run-cmake needs vcpkg for MSVC env vars
Browse files Browse the repository at this point in the history
  • Loading branch information
demianmnave committed Nov 19, 2024
1 parent b053d86 commit 8c40f70
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
11 changes: 3 additions & 8 deletions .github/workflows/msvc17.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,10 @@ jobs:
name: MSVC Latest
runs-on: windows-2022
steps:
- uses: lukka/get-cmake@latest
with:
cmakeVersion: "~3.29.0"
useCloudCache: true

- uses: actions/checkout@v4

- name: CMake configure-build-test
uses: lukka/run-cmake@v10
- uses: lukka/[email protected]
- uses: lukka/run-vcpkg@v11
- uses: lukka/run-cmake@v10
with:
configurePreset: "cml-ci-ninja-msvc-mt-s"
buildPreset: "cml-ci-ninja-msvc-mt-s-release"
Expand Down
8 changes: 8 additions & 0 deletions vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"$1": "Baseline vcpkg-root commit hash (2024.11.16) for Catch2 v3.7.1",
"builtin-baseline": "b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c",
"dependencies": [
"catch2"
]
}

0 comments on commit 8c40f70

Please sign in to comment.