Add Linux and macOS CMake presets (#7323)
* Add Linux CMake preset * Add macOS preset * Update ChangeLog
This commit is contained in:
parent
d4133d1110
commit
83175d3e45
2 changed files with 34 additions and 6 deletions
|
|
@ -2,15 +2,22 @@
|
||||||
"version": 2,
|
"version": 2,
|
||||||
"configurePresets": [
|
"configurePresets": [
|
||||||
{
|
{
|
||||||
"name": "windows",
|
"name": "base",
|
||||||
"displayName": "Windows",
|
"hidden": true,
|
||||||
"generator": "Ninja",
|
|
||||||
"binaryDir": "${sourceDir}/build",
|
"binaryDir": "${sourceDir}/build",
|
||||||
|
"generator": "Ninja",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_BUILD_TYPE": "Debug",
|
"CMAKE_BUILD_TYPE": "Debug",
|
||||||
"CMAKE_C_COMPILER": "cl.exe",
|
|
||||||
"CMAKE_CXX_COMPILER": "cl.exe",
|
|
||||||
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
|
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "windows",
|
||||||
|
"displayName": "Windows",
|
||||||
|
"inherits": "base",
|
||||||
|
"cacheVariables": {
|
||||||
|
"CMAKE_C_COMPILER": "cl.exe",
|
||||||
|
"CMAKE_CXX_COMPILER": "cl.exe"
|
||||||
},
|
},
|
||||||
"architecture": {
|
"architecture": {
|
||||||
"value": "x64",
|
"value": "x64",
|
||||||
|
|
@ -20,6 +27,16 @@
|
||||||
"value": "host=x64",
|
"value": "host=x64",
|
||||||
"strategy": "external"
|
"strategy": "external"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "linux",
|
||||||
|
"displayName": "Linux",
|
||||||
|
"inherits": "base"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "macos",
|
||||||
|
"displayName": "macOS",
|
||||||
|
"inherits": "base"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"buildPresets": [
|
"buildPresets": [
|
||||||
|
|
@ -27,6 +44,16 @@
|
||||||
"name": "windows",
|
"name": "windows",
|
||||||
"displayName": "Windows",
|
"displayName": "Windows",
|
||||||
"configurePreset": "windows"
|
"configurePreset": "windows"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "linux",
|
||||||
|
"displayName": "Linux",
|
||||||
|
"configurePreset": "linux"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "macos",
|
||||||
|
"displayName": "macOS",
|
||||||
|
"configurePreset": "macos"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,8 @@ Build/CI:
|
||||||
- #7319 Remove workflows for slow self-hosted RPi runners
|
- #7319 Remove workflows for slow self-hosted RPi runners
|
||||||
- #7320 Move build_version.py script to scripts dir
|
- #7320 Move build_version.py script to scripts dir
|
||||||
- #7321 Switch to GitHub hosted Mac M1 runner
|
- #7321 Switch to GitHub hosted Mac M1 runner
|
||||||
- #7322 Use C++20 and add VSCode tasks config
|
- #7322 Use C++20 and add Windows CMake preset
|
||||||
|
- #7323 Add Linux and macOS CMake presets
|
||||||
|
|
||||||
# 1.14.6
|
# 1.14.6
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue