Skip to content

Commit 6bc8157

Browse files
committed
Build fix
1 parent 4b9235a commit 6bc8157

1 file changed

Lines changed: 5 additions & 23 deletions

File tree

.azuredevops/pipelines/DirectXTK12-GitHub-CMake.yml

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -117,52 +117,34 @@ jobs:
117117
inputs:
118118
cwd: '$(Build.SourcesDirectory)'
119119
cmakeArgs: --build out3 -v
120-
- task: CMake@1
121-
displayName: 'CMake (MSVC Spectre): Config x64'
122-
inputs:
123-
cwd: '$(Build.SourcesDirectory)'
124-
cmakeArgs: >
125-
-G "$(VS_GENERATOR)" -T v142 -A x64 -B out4
126-
-DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
127-
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
128-
- task: CMake@1
129-
displayName: 'CMake (MSVC Spectre): Build x64 Debug'
130-
inputs:
131-
cwd: '$(Build.SourcesDirectory)'
132-
cmakeArgs: --build out4 -v --config Debug
133-
- task: CMake@1
134-
displayName: 'CMake (MSVC Spectre): Build x64 Release'
135-
inputs:
136-
cwd: '$(Build.SourcesDirectory)'
137-
cmakeArgs: --build out4 -v --config RelWithDebInfo
138120
- task: CMake@1
139121
displayName: 'CMake (NO_WCHAR_T): Config'
140122
inputs:
141123
cwd: '$(Build.SourcesDirectory)'
142124
cmakeArgs: >
143-
-G "$(VS_GENERATOR)" -T v142 -A x64 -B out5
125+
-G "$(VS_GENERATOR)" -T v142 -A x64 -B out4
144126
-DNO_WCHAR_T=ON
145127
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK)
146128
- task: CMake@1
147129
displayName: 'CMake (NO_WCHAR_T): Build'
148130
inputs:
149131
cwd: '$(Build.SourcesDirectory)'
150-
cmakeArgs: --build out5 -v --config Debug
132+
cmakeArgs: --build out4 -v --config Debug
151133
- task: CMake@1
152134
displayName: 'CMake (DLL): Config x64'
153135
inputs:
154136
cwd: '$(Build.SourcesDirectory)'
155137
cmakeArgs: >
156-
-G "$(VS_GENERATOR)" -T v142 -A x64 -B out6
138+
-G "$(VS_GENERATOR)" -T v142 -A x64 -B out5
157139
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
158140
-DBUILD_SHARED_LIBS=ON
159141
- task: CMake@1
160142
displayName: 'CMake (DLL): Build x64 Debug'
161143
inputs:
162144
cwd: '$(Build.SourcesDirectory)'
163-
cmakeArgs: --build out6 -v --config Debug
145+
cmakeArgs: --build out5 -v --config Debug
164146
- task: CMake@1
165147
displayName: 'CMake (DLL): Build x64 Release'
166148
inputs:
167149
cwd: '$(Build.SourcesDirectory)'
168-
cmakeArgs: --build out6 -v --config RelWithDebInfo
150+
cmakeArgs: --build out5 -v --config RelWithDebInfo

0 commit comments

Comments
 (0)