Skip to content

Commit 0d179e8

Browse files
alandefreitasalandefreitas
committed
build: installation workflow uses Ninja for all projects
1 parent 2b757fa commit 0d179e8

File tree

2 files changed

+131
-103
lines changed

2 files changed

+131
-103
lines changed

‎CMakeUserPresets.json.example

Lines changed: 31 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"generator": "Ninja",
1515
"binaryDir": "${sourceDir}/build/${presetName}",
1616
"cacheVariables": {
17-
"LLVM_ROOT": "C:\\Users\\$env{USERNAME}\\Libraries\\llvm\\install\\MSVC\\DebWithOpt",
18-
"Clang_ROOT": "C:\\Users\\$env{USERNAME}\\Libraries\\llvm\\install\\MSVC\\DebWithOpt",
17+
"LLVM_ROOT": "C:\\Users\\$env{USERNAME}\\Libraries\\llvm\\install\\MSVC\\Debug",
18+
"Clang_ROOT": "C:\\Users\\$env{USERNAME}\\Libraries\\llvm\\install\\MSVC\\Debug",
1919
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
2020
"CMAKE_CXX_FLAGS": "/W4",
2121
"CMAKE_C_FLAGS": "/W4"
@@ -34,17 +34,6 @@
3434
}
3535
}
3636
},
37-
{
38-
"name": "debwithopt-msvc",
39-
"displayName": "Debug with Optimizations MSVC",
40-
"description": "Build on Windows + MSVC natively (Debug with optimizations). This is the preset typically used for development. CI tests it and generates LLVM binaries for it.",
41-
"inherits": "debug-msvc",
42-
"binaryDir": "${sourceDir}/build/${presetName}",
43-
"cacheVariables": {
44-
"LLVM_ROOT": "C:\\Users\\$env{USERNAME}\\Libraries\\llvm\\DebWithOpt",
45-
"Clang_ROOT": "C:\\Users\\$env{USERNAME}\\Libraries\\llvm\\DebWithOpt"
46-
}
47-
},
4837
{
4938
"name": "release-msvc",
5039
"displayName": "Release MSVC",
@@ -57,29 +46,6 @@
5746
"Clang_ROOT": "C:\\Users\\$env{USERNAME}\\Libraries\\llvm\\Release"
5847
}
5948
},
60-
{
61-
"name": "relwithdebinfo-msvc",
62-
"displayName": "RelWithDebInfo MSVC",
63-
"description": "Build on Windows + MSVC natively (RelWithDebInfo). This is the preset used for the release builds.",
64-
"inherits": "debug-msvc",
65-
"binaryDir": "${sourceDir}/build/${presetName}",
66-
"cacheVariables": {
67-
"CMAKE_BUILD_TYPE": "RelWithDebInfo",
68-
"LLVM_ROOT": "C:\\Users\\$env{USERNAME}\\Libraries\\llvm\\Release",
69-
"Clang_ROOT": "C:\\Users\\$env{USERNAME}\\Libraries\\llvm\\Release"
70-
}
71-
},
72-
{
73-
"name": "debwithopt-clang-cl",
74-
"displayName": "Debug with Optimizations Clang-CL",
75-
"description": "Build on Windows + Clang natively. Windows developers can use this preset to catch Clang-specific issues natively.",
76-
"inherits": "debwithopt-msvc",
77-
"binaryDir": "${sourceDir}/build/${presetName}",
78-
"cacheVariables": {
79-
"CMAKE_C_COMPILER": "clang-cl.exe",
80-
"CMAKE_CXX_COMPILER": "clang-cl.exe"
81-
}
82-
},
8349
{
8450
"name": "debug-wsl-gcc",
8551
"displayName": "Debug WSL GCC",
@@ -117,18 +83,6 @@
11783
"CMAKE_CXX_FLAGS": "-fsanitize=address -fno-omit-frame-pointer -g -O0 -fno-inline-functions"
11884
}
11985
},
120-
{
121-
"name": "debwithopt-wsl-gcc",
122-
"displayName": "Debug with Optimizations WSL GCC",
123-
"description": "Build on WSL + GCC (Debug with optimizations). Windows developers can use this preset to catch GCC-specific issues with WSL. WSL tends to be very slow, so this is not recommended for interactive development.",
124-
"inherits": "debug-wsl-gcc",
125-
"binaryDir": "${sourceDir}/build/${presetName}",
126-
"cacheVariables": {
127-
"CMAKE_BUILD_TYPE": "Debug",
128-
"LLVM_ROOT": "/home/$env{USER}/libraries/llvm-project/llvm/install/Linux/Release",
129-
"Clang_ROOT": "/home/$env{USER}/libraries/llvm-project/llvm/install/Linux/Release"
130-
}
131-
},
13286
{
13387
"name": "release-wsl-gcc",
13488
"displayName": "Release WSL GCC",
@@ -171,7 +125,7 @@
171125
},
172126
{
173127
"name": "debug-macos",
174-
"displayName": "Debug macOS",
128+
"displayName": "Debug (macOS)",
175129
"description": "Preset for building MrDocs in Debug mode with the default compiler in macOS.",
176130
"inherits": "debug",
177131
"binaryDir": "${sourceDir}/build/${presetName}",
@@ -186,7 +140,8 @@
186140
"MRDOCS_BUILD_TESTS": true,
187141
"MRDOCS_BUILD_DOCS": false,
188142
"MRDOCS_GENERATE_REFERENCE": false,
189-
"MRDOCS_GENERATE_ANTORA_REFERENCE": false
143+
"MRDOCS_GENERATE_ANTORA_REFERENCE": false,
144+
"CMAKE_MAKE_PROGRAM": "$env{HOME}/Developer/cpp-libs/ninja/ninja"
190145
},
191146
"condition": {
192147
"type": "equals",
@@ -195,39 +150,42 @@
195150
},
196151
"warnings": {
197152
"unusedCli": false
198-
}
153+
},
154+
"generator": "Ninja"
199155
},
200156
{
201-
"name": "debwithopt-macos",
202-
"displayName": "DebWithOpt macOS",
203-
"description": "Preset for building MrDocs in DebWithOpt mode with the default compiler in macOS.",
157+
"name": "debug-macos-fast",
158+
"displayName": "Debug with Optimized Dependencies (macOS)",
159+
"description": "Preset for building MrDocs in Debug mode with the default compiler in macOS.",
204160
"inherits": "debug",
205161
"binaryDir": "${sourceDir}/build/${presetName}",
206162
"cacheVariables": {
207163
"CMAKE_BUILD_TYPE": "Debug",
208-
"LLVM_ROOT": "$env{HOME}/Developer/cpp-libs/llvm-project/install/debwithopt",
209-
"Clang_ROOT": "$env{HOME}/Developer/cpp-libs/llvm-project/install/debwithopt",
210-
"duktape_ROOT": "$env{HOME}/Developer/cpp-libs/duktape/install/debwithopt",
211-
"Duktape_ROOT": "$env{HOME}/Developer/cpp-libs/duktape/install/debwithopt",
164+
"LLVM_ROOT": "$env{HOME}/Developer/cpp-libs/llvm-project/install/release",
165+
"Clang_ROOT": "$env{HOME}/Developer/cpp-libs/llvm-project/install/release",
166+
"duktape_ROOT": "$env{HOME}/Developer/cpp-libs/duktape/install/release",
167+
"Duktape_ROOT": "$env{HOME}/Developer/cpp-libs/duktape/install/release",
212168
"libxml2_ROOT": "$env{HOME}/Developer/cpp-libs/libxml2/install/release",
213169
"LibXml2_ROOT": "$env{HOME}/Developer/cpp-libs/libxml2/install/release",
214170
"MRDOCS_BUILD_TESTS": true,
215171
"MRDOCS_BUILD_DOCS": false,
216172
"MRDOCS_GENERATE_REFERENCE": false,
217-
"MRDOCS_GENERATE_ANTORA_REFERENCE": false
173+
"MRDOCS_GENERATE_ANTORA_REFERENCE": false,
174+
"CMAKE_MAKE_PROGRAM": "$env{HOME}/Developer/cpp-libs/ninja/ninja"
175+
},
176+
"warnings": {
177+
"unusedCli": false
218178
},
219179
"condition": {
220180
"type": "equals",
221181
"lhs": "${hostSystemName}",
222182
"rhs": "Darwin"
223183
},
224-
"warnings": {
225-
"unusedCli": false
226-
}
184+
"generator": "Ninja"
227185
},
228186
{
229187
"name": "release-macos",
230-
"displayName": "Release macOS",
188+
"displayName": "Release (macOS)",
231189
"description": "Preset for building MrDocs in Release mode with the default compiler in macOS.",
232190
"inherits": "release",
233191
"binaryDir": "${sourceDir}/build/${presetName}",
@@ -242,7 +200,8 @@
242200
"MRDOCS_BUILD_TESTS": true,
243201
"MRDOCS_BUILD_DOCS": false,
244202
"MRDOCS_GENERATE_REFERENCE": false,
245-
"MRDOCS_GENERATE_ANTORA_REFERENCE": false
203+
"MRDOCS_GENERATE_ANTORA_REFERENCE": false,
204+
"CMAKE_MAKE_PROGRAM": "$env{HOME}/Developer/cpp-libs/ninja/ninja"
246205
},
247206
"condition": {
248207
"type": "equals",
@@ -251,11 +210,12 @@
251210
},
252211
"warnings": {
253212
"unusedCli": false
254-
}
213+
},
214+
"generator": "Ninja"
255215
},
256216
{
257217
"name": "release-macos-gcc",
258-
"displayName": "Release macOS (gcc)",
218+
"displayName": "Release (macOS) (gcc)",
259219
"description": "Preset for building MrDocs in Release mode with the gcc compiler in macOS.",
260220
"inherits": "release",
261221
"binaryDir": "${sourceDir}/build/${presetName}",
@@ -270,7 +230,10 @@
270230
"MRDOCS_BUILD_TESTS": true,
271231
"MRDOCS_BUILD_DOCS": false,
272232
"MRDOCS_GENERATE_REFERENCE": false,
273-
"MRDOCS_GENERATE_ANTORA_REFERENCE": false
233+
"MRDOCS_GENERATE_ANTORA_REFERENCE": false,
234+
"CMAKE_C_COMPILER": "/usr/bin/gcc",
235+
"CMAKE_CXX_COMPILER": "/usr/bin/g++",
236+
"CMAKE_MAKE_PROGRAM": "$env{HOME}/Developer/cpp-libs/ninja/ninja"
274237
},
275238
"warnings": {
276239
"unusedCli": false
@@ -279,35 +242,8 @@
279242
"type": "equals",
280243
"lhs": "${hostSystemName}",
281244
"rhs": "Darwin"
282-
}
283-
},
284-
{
285-
"name": "debug-macos-fast",
286-
"displayName": "Debug with Optimized Dependencies (macOS)",
287-
"description": "Preset for building MrDocs in Debug mode with the default compiler in macOS.",
288-
"inherits": "debug",
289-
"binaryDir": "${sourceDir}/build/${presetName}",
290-
"cacheVariables": {
291-
"CMAKE_BUILD_TYPE": "Debug",
292-
"LLVM_ROOT": "$env{HOME}/Developer/cpp-libs/llvm-project/install/release",
293-
"Clang_ROOT": "$env{HOME}/Developer/cpp-libs/llvm-project/install/release",
294-
"duktape_ROOT": "$env{HOME}/Developer/cpp-libs/duktape/install/release",
295-
"Duktape_ROOT": "$env{HOME}/Developer/cpp-libs/duktape/install/release",
296-
"libxml2_ROOT": "$env{HOME}/Developer/cpp-libs/libxml2/install/release",
297-
"LibXml2_ROOT": "$env{HOME}/Developer/cpp-libs/libxml2/install/release",
298-
"MRDOCS_BUILD_TESTS": true,
299-
"MRDOCS_BUILD_DOCS": false,
300-
"MRDOCS_GENERATE_REFERENCE": false,
301-
"MRDOCS_GENERATE_ANTORA_REFERENCE": false
302245
},
303-
"warnings": {
304-
"unusedCli": false
305-
},
306-
"condition": {
307-
"type": "equals",
308-
"lhs": "${hostSystemName}",
309-
"rhs": "Darwin"
310-
}
246+
"generator": "Ninja"
311247
}
312248
]
313249
}

0 commit comments

Comments
 (0)