Skip to content

Commit 9551711

Browse files
walbournwalbourn
authored
CMake update for try-compile with DLLs (#209)
1 parent cb38ff8 commit 9551711

File tree

5 files changed

+128
-33
lines changed

5 files changed

+128
-33
lines changed

‎.github/workflows/uwp.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,15 @@ jobs:
6969
- name: 'Build'
7070
working-directory: ${{ github.workspace }}
7171
run: cmake --build out\build\${{ matrix.build_type }}
72+
73+
- name: 'Clean up'
74+
working-directory: ${{ github.workspace }}
75+
run: Remove-Item -Path out -Recurse -Force
76+
77+
- name: 'Configure CMake (DLL)'
78+
working-directory: ${{ github.workspace }}
79+
run: cmake --preset=${{ matrix.build_type }} -DBUILD_SHARED_LIBS=ON
80+
81+
- name: 'Build (DLL)'
82+
working-directory: ${{ github.workspace }}
83+
run: cmake --build out\build\${{ matrix.build_type }}

‎CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ cmake_minimum_required (VERSION 3.20)
55

66
set(DIRECTXMESH_VERSION 1.6.7)
77

8-
if(WINDOWS_STORE OR (DEFINED XBOX_CONSOLE_TARGET))
9-
set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")
10-
endif()
11-
128
project(DirectXMesh
139
VERSION ${DIRECTXMESH_VERSION}
1410
DESCRIPTION "DirectXMesh geometry Library"

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

Lines changed: 67 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,10 @@ jobs:
7171
displayName: 'CMake (MSVC): Config x64'
7272
inputs:
7373
cwd: '$(Build.SourcesDirectory)'
74-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF'
74+
cmakeArgs: >
75+
-G "$(VS_GENERATOR)" -A x64 -B out
76+
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
77+
-DBUILD_DX12=OFF
7578
- task: CMake@1
7679
displayName: 'CMake (MSVC): Build x64 Debug'
7780
inputs:
@@ -86,7 +89,10 @@ jobs:
8689
displayName: 'CMake (MSVC): Config x86'
8790
inputs:
8891
cwd: '$(Build.SourcesDirectory)'
89-
cmakeArgs: '-G "$(VS_GENERATOR)" -A Win32 -B out2 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF'
92+
cmakeArgs: >
93+
-G "$(VS_GENERATOR)" -A Win32 -B out2
94+
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
95+
-DBUILD_DX12=OFF
9096
- task: CMake@1
9197
displayName: 'CMake (MSVC): Build x86 Debug'
9298
inputs:
@@ -101,7 +107,10 @@ jobs:
101107
displayName: 'CMake (MSVC): Config ARM64'
102108
inputs:
103109
cwd: '$(Build.SourcesDirectory)'
104-
cmakeArgs: '-G "$(VS_GENERATOR)" -A ARM64 -B out3 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF'
110+
cmakeArgs: >
111+
-G "$(VS_GENERATOR)" -A ARM64 -B out3
112+
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
113+
-DBUILD_DX12=OFF
105114
- task: CMake@1
106115
displayName: 'CMake (MSVC): Build ARM64 Debug'
107116
inputs:
@@ -116,7 +125,9 @@ jobs:
116125
displayName: 'CMake (UWP): Config x64'
117126
inputs:
118127
cwd: '$(Build.SourcesDirectory)'
119-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out4 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0'
128+
cmakeArgs: >
129+
-G "$(VS_GENERATOR)" -A x64 -B out4
130+
-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0
120131
- task: CMake@1
121132
displayName: 'CMake (UWP): Build x64'
122133
inputs:
@@ -126,74 +137,112 @@ jobs:
126137
displayName: 'CMake (ClangCl): Config x64'
127138
inputs:
128139
cwd: '$(Build.SourcesDirectory)'
129-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out6 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)'
140+
cmakeArgs: >
141+
-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out5
142+
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
130143
- task: CMake@1
131144
displayName: 'CMake (ClangCl): Build x64 Debug'
132145
inputs:
133146
cwd: '$(Build.SourcesDirectory)'
134-
cmakeArgs: --build out6 -v --config Debug
147+
cmakeArgs: --build out5 -v --config Debug
135148
- task: CMake@1
136149
displayName: 'CMake (ClangCl): Build x64 Release'
137150
inputs:
138151
cwd: '$(Build.SourcesDirectory)'
139-
cmakeArgs: --build out6 -v --config RelWithDebInfo
152+
cmakeArgs: --build out5 -v --config RelWithDebInfo
140153
- task: CMake@1
141154
displayName: 'CMake (ClangCl): Config ARM64'
142155
inputs:
143156
cwd: '$(Build.SourcesDirectory)'
144-
cmakeArgs: '-G "$(VS_GENERATOR)" -A ARM64 -T clangcl -B out7 -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK)'
157+
cmakeArgs: >
158+
-G "$(VS_GENERATOR)" -A ARM64 -T clangcl -B out6
159+
-DCMAKE_SYSTEM_VERSION=$(WIN11_SDK)
145160
- task: CMake@1
146161
displayName: 'CMake (ClangCl): Build ARM64'
147162
inputs:
148163
cwd: '$(Build.SourcesDirectory)'
149-
cmakeArgs: --build out7 -v --config Debug
164+
cmakeArgs: --build out6 -v --config Debug
150165
- task: CMake@1
151166
displayName: 'CMake (Win10): Config'
152167
inputs:
153168
cwd: '$(Build.SourcesDirectory)'
154-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out8 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON'
169+
cmakeArgs: >
170+
-G "$(VS_GENERATOR)" -A x64 -B out7
171+
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
172+
-DBUILD_DX12=ON
155173
- task: CMake@1
156174
displayName: 'CMake (Win10): Build'
157175
inputs:
158176
cwd: '$(Build.SourcesDirectory)'
159-
cmakeArgs: --build out8 -v --config Debug
177+
cmakeArgs: --build out7 -v --config Debug
160178
- task: CMake@1
161179
displayName: 'CMake (MSVC Spectre): Config x64'
162180
inputs:
163181
cwd: '$(Build.SourcesDirectory)'
164-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out9 -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF'
182+
cmakeArgs: >
183+
-G "$(VS_GENERATOR)" -A x64 -B out8
184+
-DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
185+
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
186+
-DBUILD_DX12=OFF
165187
- task: CMake@1
166188
displayName: 'CMake (MSVC Spectre): Build x64 Debug'
167189
inputs:
168190
cwd: '$(Build.SourcesDirectory)'
169-
cmakeArgs: --build out9 -v --config Debug
191+
cmakeArgs: --build out8 -v --config Debug
170192
- task: CMake@1
171193
displayName: 'CMake (MSVC Spectre): Build x64 Release'
172194
inputs:
173195
cwd: '$(Build.SourcesDirectory)'
174-
cmakeArgs: --build out9 -v --config RelWithDebInfo
196+
cmakeArgs: --build out8 -v --config RelWithDebInfo
175197
- task: CMake@1
176198
displayName: 'CMake (MSVC Spectre): Config ARM64'
177199
inputs:
178200
cwd: '$(Build.SourcesDirectory)'
179-
cmakeArgs: '-G "$(VS_GENERATOR)" -A ARM64 -B out10 -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF'
201+
cmakeArgs: >
202+
-G "$(VS_GENERATOR)" -A ARM64 -B out9
203+
-DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
204+
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
205+
-DBUILD_DX12=OFF
180206
- task: CMake@1
181207
displayName: 'CMake (MSVC Spectre): Build ARM64 Debug'
182208
inputs:
183209
cwd: '$(Build.SourcesDirectory)'
184-
cmakeArgs: --build out10 -v --config Debug
210+
cmakeArgs: --build out9 -v --config Debug
185211
- task: CMake@1
186212
displayName: 'CMake (MSVC Spectre): Build ARM64 Release'
187213
inputs:
188214
cwd: '$(Build.SourcesDirectory)'
189-
cmakeArgs: --build out10 -v --config RelWithDebInfo
215+
cmakeArgs: --build out9 -v --config RelWithDebInfo
190216
- task: CMake@1
191217
displayName: 'CMake (Win10 Spectre): Config'
192218
inputs:
193219
cwd: '$(Build.SourcesDirectory)'
194-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out11 -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON'
220+
cmakeArgs: >
221+
-G "$(VS_GENERATOR)" -A x64 -B out10
222+
-DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
223+
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
224+
-DBUILD_DX12=ON
195225
- task: CMake@1
196226
displayName: 'CMake (Win10 Spectre): Build'
227+
inputs:
228+
cwd: '$(Build.SourcesDirectory)'
229+
cmakeArgs: --build out10 -v --config Debug
230+
- task: CMake@1
231+
displayName: 'CMake (DLL): Config x64'
232+
inputs:
233+
cwd: '$(Build.SourcesDirectory)'
234+
cmakeArgs: >
235+
-G "$(VS_GENERATOR)" -A x64 -B out11
236+
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
237+
-DBUILD_DX12=ON
238+
-DBUILD_SHARED_LIBS=ON
239+
- task: CMake@1
240+
displayName: 'CMake (DLL): Build x64 Debug'
197241
inputs:
198242
cwd: '$(Build.SourcesDirectory)'
199243
cmakeArgs: --build out11 -v --config Debug
244+
- task: CMake@1
245+
displayName: 'CMake (DLL): Build x64 Release'
246+
inputs:
247+
cwd: '$(Build.SourcesDirectory)'
248+
cmakeArgs: --build out10 -v --config RelWithDebInfo

‎build/DirectXMesh-GitHub-CMake.yml

Lines changed: 45 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,10 @@ jobs:
7171
displayName: 'CMake (MSVC): Config x64'
7272
inputs:
7373
cwd: '$(Build.SourcesDirectory)'
74-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF'
74+
cmakeArgs: >
75+
-G "$(VS_GENERATOR)" -A x64 -B out
76+
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
77+
-DBUILD_DX12=OFF
7578
- task: CMake@1
7679
displayName: 'CMake (MSVC): Build x64 Debug'
7780
inputs:
@@ -86,7 +89,10 @@ jobs:
8689
displayName: 'CMake (MSVC): Config x86'
8790
inputs:
8891
cwd: '$(Build.SourcesDirectory)'
89-
cmakeArgs: '-G "$(VS_GENERATOR)" -A Win32 -B out2 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF'
92+
cmakeArgs: >
93+
-G "$(VS_GENERATOR)" -A Win32 -B out2
94+
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
95+
-DBUILD_DX12=OFF
9096
- task: CMake@1
9197
displayName: 'CMake (MSVC): Build x86 Debug'
9298
inputs:
@@ -101,7 +107,9 @@ jobs:
101107
displayName: 'CMake (UWP): Config x64'
102108
inputs:
103109
cwd: '$(Build.SourcesDirectory)'
104-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out3 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0'
110+
cmakeArgs: >
111+
-G "$(VS_GENERATOR)" -A x64 -B out3
112+
-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0
105113
- task: CMake@1
106114
displayName: 'CMake (UWP): Build x64'
107115
inputs:
@@ -111,7 +119,9 @@ jobs:
111119
displayName: 'CMake (ClangCl): Config x64'
112120
inputs:
113121
cwd: '$(Build.SourcesDirectory)'
114-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)'
122+
cmakeArgs: >
123+
-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4
124+
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
115125
- task: CMake@1
116126
displayName: 'CMake (ClangCl): Build x64 Debug'
117127
inputs:
@@ -126,7 +136,10 @@ jobs:
126136
displayName: 'CMake (Win10): Config'
127137
inputs:
128138
cwd: '$(Build.SourcesDirectory)'
129-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out5 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON'
139+
cmakeArgs: >
140+
-G "$(VS_GENERATOR)" -A x64 -B out5
141+
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
142+
-DBUILD_DX12=ON
130143
- task: CMake@1
131144
displayName: 'CMake (Win10): Build'
132145
inputs:
@@ -136,7 +149,10 @@ jobs:
136149
displayName: 'CMake (MSVC Spectre): Config x64'
137150
inputs:
138151
cwd: '$(Build.SourcesDirectory)'
139-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out6 -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF'
152+
cmakeArgs: >
153+
-G "$(VS_GENERATOR)" -A x64 -B out6
154+
-DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
155+
-DBUILD_DX12=OFF
140156
- task: CMake@1
141157
displayName: 'CMake (MSVC Spectre): Build x64 Debug'
142158
inputs:
@@ -151,9 +167,31 @@ jobs:
151167
displayName: 'CMake (Win10 Spectre): Config'
152168
inputs:
153169
cwd: '$(Build.SourcesDirectory)'
154-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out7 -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON'
170+
cmakeArgs: >
171+
-G "$(VS_GENERATOR)" -A x64 -B out7
172+
-DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
173+
-DBUILD_DX12=ON
155174
- task: CMake@1
156175
displayName: 'CMake (Win10 Spectre): Build'
157176
inputs:
158177
cwd: '$(Build.SourcesDirectory)'
159178
cmakeArgs: --build out7 -v --config Debug
179+
- task: CMake@1
180+
displayName: 'CMake (DLL): Config x64'
181+
inputs:
182+
cwd: '$(Build.SourcesDirectory)'
183+
cmakeArgs: >
184+
-G "$(VS_GENERATOR)" -A x64 -B out8
185+
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
186+
-DBUILD_DX12=ON
187+
-DBUILD_SHARED_LIBS=ON
188+
- task: CMake@1
189+
displayName: 'CMake (DLL): Build x64 Debug'
190+
inputs:
191+
cwd: '$(Build.SourcesDirectory)'
192+
cmakeArgs: --build out8 -v --config Debug
193+
- task: CMake@1
194+
displayName: 'CMake (DLL): Build x64 Release'
195+
inputs:
196+
cwd: '$(Build.SourcesDirectory)'
197+
cmakeArgs: --build out8 -v --config RelWithDebInfo

‎build/DirectXMesh-GitHub-GDK-Dev17.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,12 +269,12 @@ jobs:
269269
inputs:
270270
Contents: 'out/build'
271271
- task: CMake@1
272-
displayName: 'CMake (MSVC, DLL): Config Scarlett Debug'
272+
displayName: 'CMake (DLL): Config Scarlett Debug'
273273
inputs:
274274
cwd: '$(Build.SourcesDirectory)'
275275
cmakeArgs: --preset=x64-Debug-Scarlett -DBUILD_SHARED_LIBS=ON
276276
- task: CMake@1
277-
displayName: 'CMake (MSVC, DLL): Build Scarlett Debug'
277+
displayName: 'CMake (DLL): Build Scarlett Debug'
278278
inputs:
279279
cwd: '$(Build.SourcesDirectory)'
280280
cmakeArgs: --build out\build\x64-Debug-Scarlett
@@ -388,12 +388,12 @@ jobs:
388388
inputs:
389389
Contents: 'out/build'
390390
- task: CMake@1
391-
displayName: 'CMake (MSVC, DLL): Config XboxOne Debug'
391+
displayName: 'CMake (DLL): Config XboxOne Debug'
392392
inputs:
393393
cwd: '$(Build.SourcesDirectory)'
394394
cmakeArgs: --preset=x64-Debug-XboxOne -DBUILD_SHARED_LIBS=ON
395395
- task: CMake@1
396-
displayName: 'CMake (MSVC, DLL): Build XboxOne Debug'
396+
displayName: 'CMake (DLL): Build XboxOne Debug'
397397
inputs:
398398
cwd: '$(Build.SourcesDirectory)'
399399
cmakeArgs: --build out\build\x64-Debug-XboxOne

0 commit comments

Comments
 (0)