Skip to content

Commit

Permalink
Only use Ninja to build on Windows (#7327)
Browse files Browse the repository at this point in the history
* Only use Ninja for Windows and Linux

* Use make on Linux for now

* Update ChangeLog
  • Loading branch information
nbolton committed Jan 15, 2024
1 parent 668c319 commit 831ee44
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
8 changes: 5 additions & 3 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"name": "base",
"hidden": true,
"binaryDir": "${sourceDir}/build",
"generator": "Ninja",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
Expand All @@ -15,6 +14,7 @@
"name": "windows",
"displayName": "Windows",
"inherits": "base",
"generator": "Ninja",
"cacheVariables": {
"CMAKE_C_COMPILER": "cl.exe",
"CMAKE_CXX_COMPILER": "cl.exe"
Expand All @@ -31,12 +31,14 @@
{
"name": "linux",
"displayName": "Linux",
"inherits": "base"
"inherits": "base",
"generator": "Unix Makefiles"
},
{
"name": "macos",
"displayName": "macOS",
"inherits": "base"
"inherits": "base",
"generator": "Unix Makefiles"
}
],
"buildPresets": [
Expand Down
1 change: 1 addition & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Tasks:
- #7323 Add Linux and macOS CMake presets
- #7325 Add timeout to all GitHub workflows
- #7326 Restore lpDesktop assignment in Windows daemon
- #7327 Only use Ninja to build on Windows

# 1.14.6

Expand Down

0 comments on commit 831ee44

Please sign in to comment.