Skip to content

Commit

Permalink
Split CMake presets into debug and release (#7330)
Browse files Browse the repository at this point in the history
* Split presets into debug and release

* Update CL
  • Loading branch information
nbolton committed Jan 18, 2024
1 parent 29e6677 commit 4211fce
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 13 deletions.
76 changes: 63 additions & 13 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@
"hidden": true,
"binaryDir": "${sourceDir}/build",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
}
},
{
"name": "windows",
"displayName": "Windows",
"inherits": "base",
"hidden": true,
"generator": "Ninja",
"cacheVariables": {
"CMAKE_C_COMPILER": "cl.exe",
Expand All @@ -30,32 +29,83 @@
},
{
"name": "linux",
"displayName": "Linux",
"hidden": true,
"inherits": "base",
"generator": "Unix Makefiles"
},
{
"name": "macos",
"displayName": "macOS",
"hidden": true,
"inherits": "base",
"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": [
{
"name": "windows",
"displayName": "Windows",
"configurePreset": "windows"
"name": "windows-debug",
"configurePreset": "windows-debug"
},
{
"name": "linux",
"displayName": "Linux",
"configurePreset": "linux"
"name": "windows-release",
"configurePreset": "windows-release"
},
{
"name": "macos",
"displayName": "macOS",
"configurePreset": "macos"
"name": "linux-debug",
"configurePreset": "linux-debug"
},
{
"name": "linux-release",
"configurePreset": "linux-release"
},
{
"name": "macos-debug",
"configurePreset": "macos-debug"
},
{
"name": "macos-release",
"configurePreset": "macos-release"
}
]
}
1 change: 1 addition & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Tasks:
- #7326 Restore lpDesktop assignment in Windows daemon
- #7327 Only use Ninja to build on Windows
- #7328 Reset error state before calling Process32Next
- #1177 Split CMake presets into debug and release

# 1.14.6

Expand Down

0 comments on commit 4211fce

Please sign in to comment.