Skip to content

Commit d5ffc52

Browse files
authored
[CMAKE] Remove vcpkg toolchain from default windows cmake presets and add new cmake presets with vcpkg toolchain (#769)
1 parent bf30c3c commit d5ffc52

File tree

3 files changed

+214
-82
lines changed

3 files changed

+214
-82
lines changed

.github/workflows/build-toolchain.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
137137
if ("${{ inputs.preset }}" -like "win32*") {
138138
# For win32 preset, look in config-specific subdirectories
139-
$configToUse = if ("${{ inputs.preset }}" -eq "win32dbg") { "Debug" } else { "Release" }
139+
$configToUse = if ("${{ inputs.preset }}" -match "debug") { "Debug" } else { "Release" }
140140
$files = Get-ChildItem -Path "$buildDir\Core\$configToUse","$buildDir\${{ inputs.game }}\$configToUse" -File | Where-Object { $_.Extension -in @(".exe", ".dll", ".pdb") } -Verbose
141141
} else {
142142
$files = Get-ChildItem -Path "$buildDir\Core","$buildDir\${{ inputs.game }}" -File | Where-Object { $_.Extension -in @(".exe", ".dll", ".pdb") } -Verbose

.github/workflows/ci.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -66,25 +66,25 @@ jobs:
6666
- preset: "vc6"
6767
tools: true
6868
extras: true
69-
- preset: "vc6prof"
69+
- preset: "vc6-profile"
7070
tools: true
7171
extras: true
72-
- preset: "vc6int"
72+
- preset: "vc6-internal"
7373
tools: true
7474
extras: true
75-
- preset: "vc6dbg"
75+
- preset: "vc6-debug"
7676
tools: true
7777
extras: true
78-
- preset: "win32"
78+
- preset: "win32-vcpkg"
7979
tools: true
8080
extras: true
81-
- preset: "win32prof"
81+
- preset: "win32-vcpkg-profile"
8282
tools: true
8383
extras: true
84-
- preset: "win32int"
84+
- preset: "win32-vcpkg-internal"
8585
tools: true
8686
extras: true
87-
- preset: "win32dbg"
87+
- preset: "win32-vcpkg-debug"
8888
tools: true
8989
extras: true
9090
fail-fast: false
@@ -106,25 +106,25 @@ jobs:
106106
- preset: "vc6"
107107
tools: true
108108
extras: true
109-
- preset: "vc6prof"
109+
- preset: "vc6-profile"
110110
tools: true
111111
extras: true
112-
- preset: "vc6int"
112+
- preset: "vc6-internal"
113113
tools: true
114114
extras: true
115-
- preset: "vc6dbg"
115+
- preset: "vc6-debug"
116116
tools: true
117117
extras: true
118118
- preset: "win32"
119119
tools: true
120120
extras: true
121-
- preset: "win32prof"
121+
- preset: "win32-profile"
122122
tools: true
123123
extras: true
124-
- preset: "win32int"
124+
- preset: "win32-internal"
125125
tools: true
126126
extras: true
127-
- preset: "win32dbg"
127+
- preset: "win32-debug"
128128
tools: true
129129
extras: true
130130
fail-fast: false

0 commit comments

Comments
 (0)