Only use Ninja to build on Windows (#7327)
* Only use Ninja for Windows and Linux * Use make on Linux for now * Update ChangeLog
This commit is contained in:
parent
668c3193e7
commit
831ee44eb1
2 changed files with 6 additions and 3 deletions
|
|
@ -5,7 +5,6 @@
|
||||||
"name": "base",
|
"name": "base",
|
||||||
"hidden": true,
|
"hidden": true,
|
||||||
"binaryDir": "${sourceDir}/build",
|
"binaryDir": "${sourceDir}/build",
|
||||||
"generator": "Ninja",
|
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_BUILD_TYPE": "Debug",
|
"CMAKE_BUILD_TYPE": "Debug",
|
||||||
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
|
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
|
||||||
|
|
@ -15,6 +14,7 @@
|
||||||
"name": "windows",
|
"name": "windows",
|
||||||
"displayName": "Windows",
|
"displayName": "Windows",
|
||||||
"inherits": "base",
|
"inherits": "base",
|
||||||
|
"generator": "Ninja",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_C_COMPILER": "cl.exe",
|
"CMAKE_C_COMPILER": "cl.exe",
|
||||||
"CMAKE_CXX_COMPILER": "cl.exe"
|
"CMAKE_CXX_COMPILER": "cl.exe"
|
||||||
|
|
@ -31,12 +31,14 @@
|
||||||
{
|
{
|
||||||
"name": "linux",
|
"name": "linux",
|
||||||
"displayName": "Linux",
|
"displayName": "Linux",
|
||||||
"inherits": "base"
|
"inherits": "base",
|
||||||
|
"generator": "Unix Makefiles"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "macos",
|
"name": "macos",
|
||||||
"displayName": "macOS",
|
"displayName": "macOS",
|
||||||
"inherits": "base"
|
"inherits": "base",
|
||||||
|
"generator": "Unix Makefiles"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"buildPresets": [
|
"buildPresets": [
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,7 @@ Tasks:
|
||||||
- #7323 Add Linux and macOS CMake presets
|
- #7323 Add Linux and macOS CMake presets
|
||||||
- #7325 Add timeout to all GitHub workflows
|
- #7325 Add timeout to all GitHub workflows
|
||||||
- #7326 Restore lpDesktop assignment in Windows daemon
|
- #7326 Restore lpDesktop assignment in Windows daemon
|
||||||
|
- #7327 Only use Ninja to build on Windows
|
||||||
|
|
||||||
# 1.14.6
|
# 1.14.6
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue