Skip to content

Commit a04e60c

Browse files
aliendroid1aliendroid1
committed
Make debug build use program database
1 parent 09c1c2b commit a04e60c

File tree

2 files changed

+62
-90
lines changed

2 files changed

+62
-90
lines changed

‎CMakePresets.json

Lines changed: 43 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,26 @@
11
{
22
"version": 6,
3-
"cmakeMinimumRequired":
4-
{
3+
"cmakeMinimumRequired": {
54
"major": 3,
65
"minor": 25,
76
"patch": 0
87
},
9-
"configurePresets":
10-
[
8+
"configurePresets": [
119
{
1210
"name": "vc6",
1311
"displayName": "Windows 32bit VC6 Release",
14-
"generator": "Ninja",
12+
"generator": "NMake Makefiles",
1513
"hidden": false,
1614
"binaryDir": "${sourceDir}/build/${presetName}",
17-
"toolchainFile": "${sourceDir}/cmake/vc6toolchain.cmake",
18-
"cacheVariables":
19-
{
20-
"CMAKE_VERBOSE_MAKEFILE": "TRUE",
15+
"cacheVariables": {
2116
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
2217
"CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL",
23-
"CMAKE_MSVC_DEBUG_INFORMATION_FORMAT": "$<$<CONFIG:Release,Debug,RelWithDebInfo>:Embedded>",
18+
"CMAKE_MSVC_DEBUG_INFORMATION_FORMAT": "$<$<CONFIG:Release>:Embedded>$<$<CONFIG:Debug,RelWithDebInfo>:ProgramDatabase>",
2419
"CMAKE_BUILD_TYPE": "Release",
2520
"RTS_FLAGS": "/W3"
2621
},
27-
"vendor":
28-
{
29-
"jetbrains.com/clion":
30-
{
22+
"vendor": {
23+
"jetbrains.com/clion": {
3124
"toolchain": "Visual Studio 6"
3225
}
3326
}
@@ -37,17 +30,15 @@
3730
"displayName": "Windows 32bit VC6 Profile",
3831
"hidden": false,
3932
"inherits": "vc6",
40-
"cacheVariables":
41-
{
33+
"cacheVariables": {
4234
"RTS_BUILD_OPTION_PROFILE": "ON"
4335
}
4436
},
4537
{
4638
"name": "vc6-internal",
4739
"displayName": "Windows 32bit VC6 Internal",
4840
"inherits": "vc6",
49-
"cacheVariables":
50-
{
41+
"cacheVariables": {
5142
"RTS_BUILD_OPTION_INTERNAL": "ON"
5243
}
5344
},
@@ -56,8 +47,7 @@
5647
"displayName": "Windows 32bit VC6 Debug",
5748
"hidden": false,
5849
"inherits": "vc6",
59-
"cacheVariables":
60-
{
50+
"cacheVariables": {
6151
"CMAKE_BUILD_TYPE": "Debug",
6252
"RTS_BUILD_OPTION_DEBUG": "ON"
6353
}
@@ -68,8 +58,7 @@
6858
"generator": "Ninja Multi-Config",
6959
"hidden": true,
7060
"binaryDir": "${sourceDir}/build/${presetName}",
71-
"cacheVariables":
72-
{
61+
"cacheVariables": {
7362
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
7463
"CMAKE_MSVC_DEBUG_INFORMATION_FORMAT": "$<$<CONFIG:Release,Debug,RelWithDebInfo>:Embedded>",
7564
"CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL"
@@ -81,8 +70,7 @@
8170
"generator": "Ninja Multi-Config",
8271
"hidden": true,
8372
"binaryDir": "${sourceDir}/build/${presetName}",
84-
"cacheVariables":
85-
{
73+
"cacheVariables": {
8674
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
8775
"CMAKE_MSVC_DEBUG_INFORMATION_FORMAT": "$<$<CONFIG:Release,Debug,RelWithDebInfo>:Embedded>",
8876
"CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL",
@@ -94,19 +82,15 @@
9482
"inherits": "default",
9583
"hidden": false,
9684
"displayName": "Windows 32bit Release",
97-
"architecture":
98-
{
85+
"architecture": {
9986
"value": "Win32",
10087
"strategy": "external"
10188
},
102-
"cacheVariables":
103-
{
89+
"cacheVariables": {
10490
"RTS_FLAGS": "/W3"
10591
},
106-
"vendor":
107-
{
108-
"jetbrains.com/clion":
109-
{
92+
"vendor": {
93+
"jetbrains.com/clion": {
11094
"toolchain": "Visual Studio"
11195
}
11296
}
@@ -115,26 +99,23 @@
11599
"name": "win32-profile",
116100
"inherits": "win32",
117101
"displayName": "Windows 32bit Profile",
118-
"cacheVariables":
119-
{
102+
"cacheVariables": {
120103
"RTS_BUILD_OPTION_PROFILE": "ON"
121104
}
122105
},
123106
{
124107
"name": "win32-internal",
125108
"inherits": "win32",
126109
"displayName": "Windows 32bit Internal",
127-
"cacheVariables":
128-
{
110+
"cacheVariables": {
129111
"RTS_BUILD_OPTION_INTERNAL": "ON"
130112
}
131113
},
132114
{
133115
"name": "win32-debug",
134116
"inherits": "win32",
135117
"displayName": "Windows 32bit Debug",
136-
"cacheVariables":
137-
{
118+
"cacheVariables": {
138119
"RTS_BUILD_OPTION_DEBUG": "ON"
139120
}
140121
},
@@ -143,19 +124,15 @@
143124
"inherits": "default-vcpkg",
144125
"hidden": false,
145126
"displayName": "Windows 32bit VCPKG Release",
146-
"architecture":
147-
{
127+
"architecture": {
148128
"value": "Win32",
149129
"strategy": "external"
150130
},
151-
"cacheVariables":
152-
{
131+
"cacheVariables": {
153132
"RTS_FLAGS": "/W3"
154133
},
155-
"vendor":
156-
{
157-
"jetbrains.com/clion":
158-
{
134+
"vendor": {
135+
"jetbrains.com/clion": {
159136
"toolchain": "Visual Studio"
160137
}
161138
}
@@ -164,26 +141,23 @@
164141
"name": "win32-vcpkg-profile",
165142
"inherits": "win32-vcpkg",
166143
"displayName": "Windows 32bit VCPKG Profile",
167-
"cacheVariables":
168-
{
144+
"cacheVariables": {
169145
"RTS_BUILD_OPTION_PROFILE": "ON"
170146
}
171147
},
172148
{
173149
"name": "win32-vcpkg-internal",
174150
"inherits": "win32-vcpkg",
175151
"displayName": "Windows 32bit VCPKG Internal",
176-
"cacheVariables":
177-
{
152+
"cacheVariables": {
178153
"RTS_BUILD_OPTION_INTERNAL": "ON"
179154
}
180155
},
181156
{
182157
"name": "win32-vcpkg-debug",
183158
"inherits": "win32-vcpkg",
184159
"displayName": "Windows 32bit VCPKG Debug",
185-
"cacheVariables":
186-
{
160+
"cacheVariables": {
187161
"RTS_BUILD_OPTION_DEBUG": "ON"
188162
}
189163
},
@@ -194,8 +168,7 @@
194168
"displayName": "Unix 32bit VCPKG Release"
195169
}
196170
],
197-
"buildPresets":
198-
[
171+
"buildPresets": [
199172
{
200173
"name": "vc6",
201174
"configurePreset": "vc6",
@@ -218,7 +191,8 @@
218191
"name": "vc6-debug",
219192
"configurePreset": "vc6-debug",
220193
"displayName": "Build Windows 32bit VC6 Debug",
221-
"description": "Build Windows 32bit VC6 Debug"
194+
"description": "Build Windows 32bit VC6 Debug",
195+
"jobs": 1
222196
},
223197
{
224198
"name": "win32",
@@ -284,12 +258,10 @@
284258
"configuration": "Release"
285259
}
286260
],
287-
"workflowPresets":
288-
[
261+
"workflowPresets": [
289262
{
290263
"name": "vc6",
291-
"steps":
292-
[
264+
"steps": [
293265
{
294266
"type": "configure",
295267
"name": "vc6"
@@ -302,8 +274,7 @@
302274
},
303275
{
304276
"name": "vc6-debug",
305-
"steps":
306-
[
277+
"steps": [
307278
{
308279
"type": "configure",
309280
"name": "vc6-debug"
@@ -316,8 +287,7 @@
316287
},
317288
{
318289
"name": "vc6-internal",
319-
"steps":
320-
[
290+
"steps": [
321291
{
322292
"type": "configure",
323293
"name": "vc6-internal"
@@ -330,8 +300,7 @@
330300
},
331301
{
332302
"name": "vc6-profile",
333-
"steps":
334-
[
303+
"steps": [
335304
{
336305
"type": "configure",
337306
"name": "vc6-profile"
@@ -344,8 +313,7 @@
344313
},
345314
{
346315
"name": "win32",
347-
"steps":
348-
[
316+
"steps": [
349317
{
350318
"type": "configure",
351319
"name": "win32"
@@ -358,8 +326,7 @@
358326
},
359327
{
360328
"name": "win32-internal",
361-
"steps":
362-
[
329+
"steps": [
363330
{
364331
"type": "configure",
365332
"name": "win32-internal"
@@ -372,8 +339,7 @@
372339
},
373340
{
374341
"name": "win32-profile",
375-
"steps":
376-
[
342+
"steps": [
377343
{
378344
"type": "configure",
379345
"name": "win32-profile"
@@ -386,8 +352,7 @@
386352
},
387353
{
388354
"name": "win32-debug",
389-
"steps":
390-
[
355+
"steps": [
391356
{
392357
"type": "configure",
393358
"name": "win32-debug"
@@ -400,8 +365,7 @@
400365
},
401366
{
402367
"name": "win32-vcpkg",
403-
"steps":
404-
[
368+
"steps": [
405369
{
406370
"type": "configure",
407371
"name": "win32-vcpkg"
@@ -414,8 +378,7 @@
414378
},
415379
{
416380
"name": "win32-vcpkg-internal",
417-
"steps":
418-
[
381+
"steps": [
419382
{
420383
"type": "configure",
421384
"name": "win32-vcpkg-internal"
@@ -428,8 +391,7 @@
428391
},
429392
{
430393
"name": "win32-vcpkg-profile",
431-
"steps":
432-
[
394+
"steps": [
433395
{
434396
"type": "configure",
435397
"name": "win32-vcpkg-profile"
@@ -442,8 +404,7 @@
442404
},
443405
{
444406
"name": "win32-vcpkg-debug",
445-
"steps":
446-
[
407+
"steps": [
447408
{
448409
"type": "configure",
449410
"name": "win32-vcpkg-debug"
@@ -456,8 +417,7 @@
456417
},
457418
{
458419
"name": "unix",
459-
"steps":
460-
[
420+
"steps": [
461421
{
462422
"type": "configure",
463423
"name": "unix"

0 commit comments

Comments
 (0)