diff --git a/CMakePresets.json b/CMakePresets.json index 45dd3d5d3..f576fa3a6 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -2,15 +2,22 @@ "version": 2, "configurePresets": [ { - "name": "windows", - "displayName": "Windows", - "generator": "Ninja", + "name": "base", + "hidden": true, "binaryDir": "${sourceDir}/build", + "generator": "Ninja", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_C_COMPILER": "cl.exe", - "CMAKE_CXX_COMPILER": "cl.exe", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + } + }, + { + "name": "windows", + "displayName": "Windows", + "inherits": "base", + "cacheVariables": { + "CMAKE_C_COMPILER": "cl.exe", + "CMAKE_CXX_COMPILER": "cl.exe" }, "architecture": { "value": "x64", @@ -20,6 +27,16 @@ "value": "host=x64", "strategy": "external" } + }, + { + "name": "linux", + "displayName": "Linux", + "inherits": "base" + }, + { + "name": "macos", + "displayName": "macOS", + "inherits": "base" } ], "buildPresets": [ @@ -27,6 +44,16 @@ "name": "windows", "displayName": "Windows", "configurePreset": "windows" + }, + { + "name": "linux", + "displayName": "Linux", + "configurePreset": "linux" + }, + { + "name": "macos", + "displayName": "macOS", + "configurePreset": "macos" } ] } diff --git a/ChangeLog b/ChangeLog index 53b99cbb0..b256dac93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,7 +21,8 @@ Build/CI: - #7319 Remove workflows for slow self-hosted RPi runners - #7320 Move build_version.py script to scripts dir - #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