Skip to content

Commit 5a9e328

Browse files
walbournwalbourn
committed
YAML cleanup
1 parent 9a9d634 commit 5a9e328

4 files changed

+112
-46
lines changed

‎build/DirectXTex-GitHub-CMake-Dev17.yml

+52-26
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ jobs:
8181
displayName: 'CMake (MSVC): Config x64'
8282
inputs:
8383
cwd: $(Build.SourcesDirectory)
84-
cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF
84+
cmakeArgs: >
85+
-G "$(VS_GENERATOR)" -A x64 -B out
86+
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF
8587
- task: CMake@1
8688
displayName: 'CMake (MSVC): Build x64 Debug'
8789
inputs:
@@ -96,7 +98,9 @@ jobs:
9698
displayName: 'CMake (MSVC): Config x86'
9799
inputs:
98100
cwd: $(Build.SourcesDirectory)
99-
cmakeArgs: -G "$(VS_GENERATOR)" -A Win32 -B out2 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF
101+
cmakeArgs: >
102+
-G "$(VS_GENERATOR)" -A Win32 -B out2
103+
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF
100104
- task: CMake@1
101105
displayName: 'CMake (MSVC): Build x86 Debug'
102106
inputs:
@@ -111,7 +115,9 @@ jobs:
111115
displayName: 'CMake (MSVC): Config ARM64'
112116
inputs:
113117
cwd: $(Build.SourcesDirectory)
114-
cmakeArgs: -G "$(VS_GENERATOR)" -A ARM64 -B out3 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF
118+
cmakeArgs: >
119+
-G "$(VS_GENERATOR)" -A ARM64 -B out3
120+
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF
115121
- task: CMake@1
116122
displayName: 'CMake (MSVC): Build ARM64 Debug'
117123
inputs:
@@ -126,7 +132,9 @@ jobs:
126132
displayName: 'CMake (UWP): Config x64'
127133
inputs:
128134
cwd: $(Build.SourcesDirectory)
129-
cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out4 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0
135+
cmakeArgs: >
136+
-G "$(VS_GENERATOR)" -A x64 -B out4
137+
-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0
130138
- task: CMake@1
131139
displayName: 'CMake (UWP): Build x64'
132140
inputs:
@@ -136,112 +144,130 @@ jobs:
136144
displayName: 'CMake (ClangCl): Config x64'
137145
inputs:
138146
cwd: $(Build.SourcesDirectory)
139-
cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out6 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
147+
cmakeArgs: >
148+
-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out5
149+
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
140150
- task: CMake@1
141151
displayName: 'CMake (ClangCl): Build x64 Debug'
142152
inputs:
143153
cwd: $(Build.SourcesDirectory)
144-
cmakeArgs: --build out6 -v --config Debug
154+
cmakeArgs: --build out5 -v --config Debug
145155
- task: CMake@1
146156
displayName: 'CMake (ClangCl): Build x64 Release'
147157
inputs:
148158
cwd: $(Build.SourcesDirectory)
149-
cmakeArgs: --build out6 -v --config RelWithDebInfo
159+
cmakeArgs: --build out5 -v --config RelWithDebInfo
150160
- task: CMake@1
151161
displayName: 'CMake (ClangCl): Config ARM64'
152162
inputs:
153163
cwd: $(Build.SourcesDirectory)
154-
cmakeArgs: -G "$(VS_GENERATOR)" -A ARM64 -T clangcl -B out7 -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK)
164+
cmakeArgs: >
165+
-G "$(VS_GENERATOR)" -A ARM64 -T clangcl -B out6
166+
-DCMAKE_SYSTEM_VERSION=$(WIN11_SDK)
155167
- task: CMake@1
156168
displayName: 'CMake (ClangCl): Build ARM64'
157169
inputs:
158170
cwd: $(Build.SourcesDirectory)
159-
cmakeArgs: --build out7 -v --config Debug
171+
cmakeArgs: --build out6 -v --config Debug
160172
- task: CMake@1
161173
displayName: 'CMake (Win10): Config'
162174
inputs:
163175
cwd: $(Build.SourcesDirectory)
164-
cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out8 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON
176+
cmakeArgs: >
177+
-G "$(VS_GENERATOR)" -A x64 -B out7
178+
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON
165179
- task: CMake@1
166180
displayName: 'CMake (Win10): Build'
167181
inputs:
168182
cwd: $(Build.SourcesDirectory)
169-
cmakeArgs: --build out8 -v --config Debug
183+
cmakeArgs: --build out7 -v --config Debug
170184
- task: CMake@1
171185
displayName: 'CMake (MSVC Spectre): Config x64'
172186
inputs:
173187
cwd: $(Build.SourcesDirectory)
174-
cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out9 -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF
188+
cmakeArgs: >
189+
-G "$(VS_GENERATOR)" -A x64 -B out8
190+
-DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF
175191
- task: CMake@1
176192
displayName: 'CMake (MSVC Spectre): Build x64 Debug'
177193
inputs:
178194
cwd: $(Build.SourcesDirectory)
179-
cmakeArgs: --build out9 -v --config Debug
195+
cmakeArgs: --build out8 -v --config Debug
180196
- task: CMake@1
181197
displayName: 'CMake (MSVC Spectre): Build x64 Release'
182198
inputs:
183199
cwd: $(Build.SourcesDirectory)
184-
cmakeArgs: --build out9 -v --config RelWithDebInfo
200+
cmakeArgs: --build out8 -v --config RelWithDebInfo
185201
- task: CMake@1
186202
displayName: 'CMake (MSVC Spectre): Config ARM64'
187203
inputs:
188204
cwd: $(Build.SourcesDirectory)
189-
cmakeArgs: -G "$(VS_GENERATOR)" -A ARM64 -B out10 -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF
205+
cmakeArgs: >
206+
-G "$(VS_GENERATOR)" -A ARM64 -B out9
207+
-DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF
190208
- task: CMake@1
191209
displayName: 'CMake (MSVC Spectre): Build ARM64 Debug'
192210
inputs:
193211
cwd: $(Build.SourcesDirectory)
194-
cmakeArgs: --build out10 -v --config Debug
212+
cmakeArgs: --build out9 -v --config Debug
195213
- task: CMake@1
196214
displayName: 'CMake (MSVC Spectre): Build ARM64 Release'
197215
inputs:
198216
cwd: $(Build.SourcesDirectory)
199-
cmakeArgs: --build out10 -v --config RelWithDebInfo
217+
cmakeArgs: --build out9 -v --config RelWithDebInfo
200218
- task: CMake@1
201219
displayName: 'CMake (Win10 Spectre): Config'
202220
inputs:
203221
cwd: $(Build.SourcesDirectory)
204-
cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out11 -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON
222+
cmakeArgs: >
223+
-G "$(VS_GENERATOR)" -A x64 -B out10
224+
-DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON
205225
- task: CMake@1
206226
displayName: 'CMake (Win10 Spectre): Build'
207227
inputs:
208228
cwd: $(Build.SourcesDirectory)
209-
cmakeArgs: --build out11 -v --config Debug
229+
cmakeArgs: --build out10 -v --config Debug
210230
- task: CMake@1
211231
displayName: 'CMake (NO_WCHAR_T): Config'
212232
inputs:
213233
cwd: $(Build.SourcesDirectory)
214-
cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out12 -DNO_WCHAR_T=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK) -DBUILD_DX12=ON
234+
cmakeArgs: >
235+
-G "$(VS_GENERATOR)" -A x64 -B out11
236+
-DNO_WCHAR_T=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK) -DBUILD_DX12=ON
215237
- task: CMake@1
216238
displayName: 'CMake (NO_WCHAR_T): Build'
217239
inputs:
218240
cwd: $(Build.SourcesDirectory)
219-
cmakeArgs: --build out12 -v --config Debug
241+
cmakeArgs: --build out11 -v --config Debug
220242
- task: CMake@1
221243
displayName: 'CMake (DLL): Config x64'
222244
inputs:
223245
cwd: $(Build.SourcesDirectory)
224-
cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out13 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON -DBUILD_SHARED_LIBS=ON
246+
cmakeArgs: >
247+
-G "$(VS_GENERATOR)" -A x64 -B out12
248+
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON -DBUILD_SHARED_LIBS=ON
225249
- task: CMake@1
226250
displayName: 'CMake (DLL): Build x64 Debug'
227251
inputs:
228252
cwd: $(Build.SourcesDirectory)
229-
cmakeArgs: --build out13 -v --config Debug
253+
cmakeArgs: --build out12 -v --config Debug
230254
- task: CMake@1
231255
displayName: 'CMake (DLL): Build x64 Release'
232256
inputs:
233257
cwd: $(Build.SourcesDirectory)
234-
cmakeArgs: --build out13 -v --config RelWithDebInfo
258+
cmakeArgs: --build out12 -v --config RelWithDebInfo
235259
- task: CMake@1
236260
displayName: 'CMake (UWP DLL): Config x64'
237261
inputs:
238262
cwd: $(Build.SourcesDirectory)
239-
cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out14 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0 -DBUILD_SHARED_LIBS=ON
263+
cmakeArgs: >
264+
-G "$(VS_GENERATOR)" -A x64 -B out13
265+
-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0 -DBUILD_SHARED_LIBS=ON
240266
- task: CMake@1
241267
displayName: 'CMake (UWP DLL): Build x64'
242268
inputs:
243269
cwd: $(Build.SourcesDirectory)
244-
cmakeArgs: --build out14 -v
270+
cmakeArgs: --build out13 -v
245271

246272
- job: CMAKE_BUILD_VCPKG
247273
displayName: CMake using VCPKG

‎build/DirectXTex-GitHub-CMake-Xbox-Dev17.yml

+18-6
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@ jobs:
9797
displayName: 'CMake (MSVC): Config x64 (Xbox Series X|S)'
9898
inputs:
9999
cwd: ''
100-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF'
100+
cmakeArgs: >
101+
-G "$(VS_GENERATOR)" -A x64 -B out
102+
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF
101103
- task: CMake@1
102104
displayName: 'CMake (MSVC): Build x64 Debug (Xbox Series X|S)'
103105
inputs:
@@ -112,7 +114,9 @@ jobs:
112114
displayName: 'CMake (ClangCl): Config x64 (Xbox Series X|S)'
113115
inputs:
114116
cwd: ''
115-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out2 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF'
117+
cmakeArgs: >
118+
-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out2
119+
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF
116120
- task: CMake@1
117121
displayName: 'CMake (ClangCl): Build x64 Debug (Xbox Series X|S)'
118122
inputs:
@@ -127,7 +131,9 @@ jobs:
127131
displayName: 'CMake (MSVC): Config x64 (Xbox One)'
128132
inputs:
129133
cwd: ''
130-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out3 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF'
134+
cmakeArgs: >
135+
-G "$(VS_GENERATOR)" -A x64 -B out3
136+
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF
131137
- task: CMake@1
132138
displayName: 'CMake (MSVC): Build x64 Debug (Xbox One)'
133139
inputs:
@@ -142,7 +148,9 @@ jobs:
142148
displayName: 'CMake (ClangCl): Config x64 (Xbox One)'
143149
inputs:
144150
cwd: ''
145-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF'
151+
cmakeArgs: >
152+
-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4
153+
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF
146154
- task: CMake@1
147155
displayName: 'CMake (ClangCl): Build x64 Debug (Xbox One)'
148156
inputs:
@@ -157,7 +165,9 @@ jobs:
157165
displayName: 'CMake (MSVC): Config x64 (Xbox Series X|S, DLL)'
158166
inputs:
159167
cwd: ''
160-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out5 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF -DBUILD_SHARED_LIBS=ON'
168+
cmakeArgs: >
169+
-G "$(VS_GENERATOR)" -A x64 -B out5
170+
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF -DBUILD_SHARED_LIBS=ON
161171
- task: CMake@1
162172
displayName: 'CMake (MSVC): Build x64 Debug (Xbox Series X|S, DLL)'
163173
inputs:
@@ -167,7 +177,9 @@ jobs:
167177
displayName: 'CMake (MSVC): Config x64 (Xbox One, DLL)'
168178
inputs:
169179
cwd: ''
170-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out6 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF -DBUILD_SHARED_LIBS=ON'
180+
cmakeArgs: >
181+
-G "$(VS_GENERATOR)" -A x64 -B out6
182+
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF -DBUILD_SHARED_LIBS=ON
171183
- task: CMake@1
172184
displayName: 'CMake (MSVC): Build x64 Debug (Xbox One, DLL)'
173185
inputs:

‎build/DirectXTex-GitHub-CMake-Xbox.yml

+12-4
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,9 @@ jobs:
114114
displayName: 'CMake (MSVC): Config x64 (Xbox Series X|S)'
115115
inputs:
116116
cwd: ''
117-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF'
117+
cmakeArgs: >
118+
-G "$(VS_GENERATOR)" -A x64 -B out
119+
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF
118120
- task: CMake@1
119121
displayName: 'CMake (MSVC): Build x64 Debug (Xbox Series X|S)'
120122
inputs:
@@ -129,7 +131,9 @@ jobs:
129131
displayName: 'CMake (ClangCl): Config x64 (Xbox Series X|S)'
130132
inputs:
131133
cwd: ''
132-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out2 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF'
134+
cmakeArgs: >
135+
-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out2
136+
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF
133137
- task: CMake@1
134138
displayName: 'CMake (ClangCl): Build x64 Debug (Xbox Series X|S)'
135139
inputs:
@@ -144,7 +148,9 @@ jobs:
144148
displayName: 'CMake (MSVC): Config x64 (Xbox One)'
145149
inputs:
146150
cwd: ''
147-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out3 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF'
151+
cmakeArgs: >
152+
-G "$(VS_GENERATOR)" -A x64 -B out3
153+
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF
148154
- task: CMake@1
149155
displayName: 'CMake (MSVC): Build x64 Debug (Xbox One)'
150156
inputs:
@@ -159,7 +165,9 @@ jobs:
159165
displayName: 'CMake (ClangCl): Config x64 (Xbox One)'
160166
inputs:
161167
cwd: ''
162-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF'
168+
cmakeArgs: >
169+
-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4
170+
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF
163171
- task: CMake@1
164172
displayName: 'CMake (ClangCl): Build x64 Debug (Xbox One)'
165173
inputs:

0 commit comments

Comments
 (0)