Split CMake presets into debug and release (#7330)
* Split presets into debug and release * Update CL
This commit is contained in:
parent
29e66773c8
commit
4211fce112
2 changed files with 64 additions and 13 deletions
|
|
@ -6,14 +6,13 @@
|
||||||
"hidden": true,
|
"hidden": true,
|
||||||
"binaryDir": "${sourceDir}/build",
|
"binaryDir": "${sourceDir}/build",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_BUILD_TYPE": "Debug",
|
|
||||||
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
|
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "windows",
|
"name": "windows",
|
||||||
"displayName": "Windows",
|
|
||||||
"inherits": "base",
|
"inherits": "base",
|
||||||
|
"hidden": true,
|
||||||
"generator": "Ninja",
|
"generator": "Ninja",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_C_COMPILER": "cl.exe",
|
"CMAKE_C_COMPILER": "cl.exe",
|
||||||
|
|
@ -30,32 +29,83 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "linux",
|
"name": "linux",
|
||||||
"displayName": "Linux",
|
"hidden": true,
|
||||||
"inherits": "base",
|
"inherits": "base",
|
||||||
"generator": "Unix Makefiles"
|
"generator": "Unix Makefiles"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "macos",
|
"name": "macos",
|
||||||
"displayName": "macOS",
|
"hidden": true,
|
||||||
"inherits": "base",
|
"inherits": "base",
|
||||||
"generator": "Unix Makefiles"
|
"generator": "Unix Makefiles"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "windows-debug",
|
||||||
|
"inherits": "windows",
|
||||||
|
"cacheVariables": {
|
||||||
|
"CMAKE_BUILD_TYPE": "Debug"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "windows-release",
|
||||||
|
"inherits": "windows",
|
||||||
|
"cacheVariables": {
|
||||||
|
"CMAKE_BUILD_TYPE": "Release"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "linux-debug",
|
||||||
|
"inherits": "linux",
|
||||||
|
"cacheVariables": {
|
||||||
|
"CMAKE_BUILD_TYPE": "Debug"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "linux-release",
|
||||||
|
"inherits": "linux",
|
||||||
|
"cacheVariables": {
|
||||||
|
"CMAKE_BUILD_TYPE": "Release"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "macos-debug",
|
||||||
|
"inherits": "macos",
|
||||||
|
"cacheVariables": {
|
||||||
|
"CMAKE_BUILD_TYPE": "Debug"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "macos-release",
|
||||||
|
"inherits": "macos",
|
||||||
|
"cacheVariables": {
|
||||||
|
"CMAKE_BUILD_TYPE": "Release"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"buildPresets": [
|
"buildPresets": [
|
||||||
{
|
{
|
||||||
"name": "windows",
|
"name": "windows-debug",
|
||||||
"displayName": "Windows",
|
"configurePreset": "windows-debug"
|
||||||
"configurePreset": "windows"
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "linux",
|
"name": "windows-release",
|
||||||
"displayName": "Linux",
|
"configurePreset": "windows-release"
|
||||||
"configurePreset": "linux"
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "macos",
|
"name": "linux-debug",
|
||||||
"displayName": "macOS",
|
"configurePreset": "linux-debug"
|
||||||
"configurePreset": "macos"
|
},
|
||||||
|
{
|
||||||
|
"name": "linux-release",
|
||||||
|
"configurePreset": "linux-release"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "macos-debug",
|
||||||
|
"configurePreset": "macos-debug"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "macos-release",
|
||||||
|
"configurePreset": "macos-release"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,7 @@ Tasks:
|
||||||
- #7326 Restore lpDesktop assignment in Windows daemon
|
- #7326 Restore lpDesktop assignment in Windows daemon
|
||||||
- #7327 Only use Ninja to build on Windows
|
- #7327 Only use Ninja to build on Windows
|
||||||
- #7328 Reset error state before calling Process32Next
|
- #7328 Reset error state before calling Process32Next
|
||||||
|
- #1177 Split CMake presets into debug and release
|
||||||
|
|
||||||
# 1.14.6
|
# 1.14.6
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue