Skip to content

Commit a8e7920

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

File tree

2 files changed

+61
-88
lines changed

2 files changed

+61
-88
lines changed

‎CMakePresets.json

Lines changed: 42 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,27 @@
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",
1412
"generator": "Ninja",
1513
"hidden": false,
1614
"binaryDir": "${sourceDir}/build/${presetName}",
1715
"toolchainFile": "${sourceDir}/cmake/vc6toolchain.cmake",
18-
"cacheVariables":
19-
{
20-
"CMAKE_VERBOSE_MAKEFILE": "TRUE",
16+
"cacheVariables": {
2117
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
2218
"CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL",
23-
"CMAKE_MSVC_DEBUG_INFORMATION_FORMAT": "$<$<CONFIG:Release,Debug,RelWithDebInfo>:Embedded>",
19+
"CMAKE_MSVC_DEBUG_INFORMATION_FORMAT": "$<$<CONFIG:Release>:Embedded>$<$<CONFIG:Debug,RelWithDebInfo>:ProgramDatabase>",
2420
"CMAKE_BUILD_TYPE": "Release",
2521
"RTS_FLAGS": "/W3"
2622
},
27-
"vendor":
28-
{
29-
"jetbrains.com/clion":
30-
{
23+
"vendor": {
24+
"jetbrains.com/clion": {
3125
"toolchain": "Visual Studio 6"
3226
}
3327
}
@@ -37,17 +31,15 @@
3731
"displayName": "Windows 32bit VC6 Profile",
3832
"hidden": false,
3933
"inherits": "vc6",
40-
"cacheVariables":
41-
{
34+
"cacheVariables": {
4235
"RTS_BUILD_OPTION_PROFILE": "ON"
4336
}
4437
},
4538
{
4639
"name": "vc6-internal",
4740
"displayName": "Windows 32bit VC6 Internal",
4841
"inherits": "vc6",
49-
"cacheVariables":
50-
{
42+
"cacheVariables": {
5143
"RTS_BUILD_OPTION_INTERNAL": "ON"
5244
}
5345
},
@@ -56,8 +48,7 @@
5648
"displayName": "Windows 32bit VC6 Debug",
5749
"hidden": false,
5850
"inherits": "vc6",
59-
"cacheVariables":
60-
{
51+
"cacheVariables": {
6152
"CMAKE_BUILD_TYPE": "Debug",
6253
"RTS_BUILD_OPTION_DEBUG": "ON"
6354
}
@@ -68,8 +59,7 @@
6859
"generator": "Ninja Multi-Config",
6960
"hidden": true,
7061
"binaryDir": "${sourceDir}/build/${presetName}",
71-
"cacheVariables":
72-
{
62+
"cacheVariables": {
7363
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
7464
"CMAKE_MSVC_DEBUG_INFORMATION_FORMAT": "$<$<CONFIG:Release,Debug,RelWithDebInfo>:Embedded>",
7565
"CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL"
@@ -81,8 +71,7 @@
8171
"generator": "Ninja Multi-Config",
8272
"hidden": true,
8373
"binaryDir": "${sourceDir}/build/${presetName}",
84-
"cacheVariables":
85-
{
74+
"cacheVariables": {
8675
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
8776
"CMAKE_MSVC_DEBUG_INFORMATION_FORMAT": "$<$<CONFIG:Release,Debug,RelWithDebInfo>:Embedded>",
8877
"CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL",
@@ -94,19 +83,15 @@
9483
"inherits": "default",
9584
"hidden": false,
9685
"displayName": "Windows 32bit Release",
97-
"architecture":
98-
{
86+
"architecture": {
9987
"value": "Win32",
10088
"strategy": "external"
10189
},
102-
"cacheVariables":
103-
{
90+
"cacheVariables": {
10491
"RTS_FLAGS": "/W3"
10592
},
106-
"vendor":
107-
{
108-
"jetbrains.com/clion":
109-
{
93+
"vendor": {
94+
"jetbrains.com/clion": {
11095
"toolchain": "Visual Studio"
11196
}
11297
}
@@ -115,26 +100,23 @@
115100
"name": "win32-profile",
116101
"inherits": "win32",
117102
"displayName": "Windows 32bit Profile",
118-
"cacheVariables":
119-
{
103+
"cacheVariables": {
120104
"RTS_BUILD_OPTION_PROFILE": "ON"
121105
}
122106
},
123107
{
124108
"name": "win32-internal",
125109
"inherits": "win32",
126110
"displayName": "Windows 32bit Internal",
127-
"cacheVariables":
128-
{
111+
"cacheVariables": {
129112
"RTS_BUILD_OPTION_INTERNAL": "ON"
130113
}
131114
},
132115
{
133116
"name": "win32-debug",
134117
"inherits": "win32",
135118
"displayName": "Windows 32bit Debug",
136-
"cacheVariables":
137-
{
119+
"cacheVariables": {
138120
"RTS_BUILD_OPTION_DEBUG": "ON"
139121
}
140122
},
@@ -143,19 +125,15 @@
143125
"inherits": "default-vcpkg",
144126
"hidden": false,
145127
"displayName": "Windows 32bit VCPKG Release",
146-
"architecture":
147-
{
128+
"architecture": {
148129
"value": "Win32",
149130
"strategy": "external"
150131
},
151-
"cacheVariables":
152-
{
132+
"cacheVariables": {
153133
"RTS_FLAGS": "/W3"
154134
},
155-
"vendor":
156-
{
157-
"jetbrains.com/clion":
158-
{
135+
"vendor": {
136+
"jetbrains.com/clion": {
159137
"toolchain": "Visual Studio"
160138
}
161139
}
@@ -164,26 +142,23 @@
164142
"name": "win32-vcpkg-profile",
165143
"inherits": "win32-vcpkg",
166144
"displayName": "Windows 32bit VCPKG Profile",
167-
"cacheVariables":
168-
{
145+
"cacheVariables": {
169146
"RTS_BUILD_OPTION_PROFILE": "ON"
170147
}
171148
},
172149
{
173150
"name": "win32-vcpkg-internal",
174151
"inherits": "win32-vcpkg",
175152
"displayName": "Windows 32bit VCPKG Internal",
176-
"cacheVariables":
177-
{
153+
"cacheVariables": {
178154
"RTS_BUILD_OPTION_INTERNAL": "ON"
179155
}
180156
},
181157
{
182158
"name": "win32-vcpkg-debug",
183159
"inherits": "win32-vcpkg",
184160
"displayName": "Windows 32bit VCPKG Debug",
185-
"cacheVariables":
186-
{
161+
"cacheVariables": {
187162
"RTS_BUILD_OPTION_DEBUG": "ON"
188163
}
189164
},
@@ -194,8 +169,7 @@
194169
"displayName": "Unix 32bit VCPKG Release"
195170
}
196171
],
197-
"buildPresets":
198-
[
172+
"buildPresets": [
199173
{
200174
"name": "vc6",
201175
"configurePreset": "vc6",
@@ -218,7 +192,8 @@
218192
"name": "vc6-debug",
219193
"configurePreset": "vc6-debug",
220194
"displayName": "Build Windows 32bit VC6 Debug",
221-
"description": "Build Windows 32bit VC6 Debug"
195+
"description": "Build Windows 32bit VC6 Debug",
196+
"jobs": 1
222197
},
223198
{
224199
"name": "win32",
@@ -284,12 +259,10 @@
284259
"configuration": "Release"
285260
}
286261
],
287-
"workflowPresets":
288-
[
262+
"workflowPresets": [
289263
{
290264
"name": "vc6",
291-
"steps":
292-
[
265+
"steps": [
293266
{
294267
"type": "configure",
295268
"name": "vc6"
@@ -302,8 +275,7 @@
302275
},
303276
{
304277
"name": "vc6-debug",
305-
"steps":
306-
[
278+
"steps": [
307279
{
308280
"type": "configure",
309281
"name": "vc6-debug"
@@ -316,8 +288,7 @@
316288
},
317289
{
318290
"name": "vc6-internal",
319-
"steps":
320-
[
291+
"steps": [
321292
{
322293
"type": "configure",
323294
"name": "vc6-internal"
@@ -330,8 +301,7 @@
330301
},
331302
{
332303
"name": "vc6-profile",
333-
"steps":
334-
[
304+
"steps": [
335305
{
336306
"type": "configure",
337307
"name": "vc6-profile"
@@ -344,8 +314,7 @@
344314
},
345315
{
346316
"name": "win32",
347-
"steps":
348-
[
317+
"steps": [
349318
{
350319
"type": "configure",
351320
"name": "win32"
@@ -358,8 +327,7 @@
358327
},
359328
{
360329
"name": "win32-internal",
361-
"steps":
362-
[
330+
"steps": [
363331
{
364332
"type": "configure",
365333
"name": "win32-internal"
@@ -372,8 +340,7 @@
372340
},
373341
{
374342
"name": "win32-profile",
375-
"steps":
376-
[
343+
"steps": [
377344
{
378345
"type": "configure",
379346
"name": "win32-profile"
@@ -386,8 +353,7 @@
386353
},
387354
{
388355
"name": "win32-debug",
389-
"steps":
390-
[
356+
"steps": [
391357
{
392358
"type": "configure",
393359
"name": "win32-debug"
@@ -400,8 +366,7 @@
400366
},
401367
{
402368
"name": "win32-vcpkg",
403-
"steps":
404-
[
369+
"steps": [
405370
{
406371
"type": "configure",
407372
"name": "win32-vcpkg"
@@ -414,8 +379,7 @@
414379
},
415380
{
416381
"name": "win32-vcpkg-internal",
417-
"steps":
418-
[
382+
"steps": [
419383
{
420384
"type": "configure",
421385
"name": "win32-vcpkg-internal"
@@ -428,8 +392,7 @@
428392
},
429393
{
430394
"name": "win32-vcpkg-profile",
431-
"steps":
432-
[
395+
"steps": [
433396
{
434397
"type": "configure",
435398
"name": "win32-vcpkg-profile"
@@ -442,8 +405,7 @@
442405
},
443406
{
444407
"name": "win32-vcpkg-debug",
445-
"steps":
446-
[
408+
"steps": [
447409
{
448410
"type": "configure",
449411
"name": "win32-vcpkg-debug"
@@ -456,8 +418,7 @@
456418
},
457419
{
458420
"name": "unix",
459-
"steps":
460-
[
421+
"steps": [
461422
{
462423
"type": "configure",
463424
"name": "unix"

0 commit comments

Comments
 (0)