fix clang/gcc cmake presets

This commit is contained in:
BlackMATov
2022-12-27 03:06:17 +07:00
parent 36e96850ee
commit 59ac01ae41
2 changed files with 49 additions and 3 deletions

View File

@@ -13,7 +13,7 @@ jobs:
- { os: "ubuntu-20.04", cc: "gcc-10", cxx: "g++-10" } - { os: "ubuntu-20.04", cc: "gcc-10", cxx: "g++-10" }
- { os: "ubuntu-20.04", cc: "clang-10", cxx: "clang++-10" } - { os: "ubuntu-20.04", cc: "clang-10", cxx: "clang++-10" }
- { os: "ubuntu-22.04", cc: "gcc-12", cxx: "g++-12" } - { os: "ubuntu-22.04", cc: "gcc-12", cxx: "g++-12" }
- { os: "ubuntu-22.04", cc: "clang-15", cxx: "clang++-15" } - { os: "ubuntu-22.04", cc: "clang-14", cxx: "clang++-14" }
name: "${{matrix.config.cxx}}" name: "${{matrix.config.cxx}}"
steps: steps:
- name: Setup - name: Setup

View File

@@ -36,6 +36,14 @@
"CMAKE_CXX_COMPILER": "clang++-10" "CMAKE_CXX_COMPILER": "clang++-10"
} }
}, },
{
"name": "linux-clang-14",
"inherits": "linux-base",
"cacheVariables": {
"CMAKE_C_COMPILER": "clang-14",
"CMAKE_CXX_COMPILER": "clang++-14"
}
},
{ {
"name": "linux-gcc-10", "name": "linux-gcc-10",
"inherits": "linux-base", "inherits": "linux-base",
@@ -44,6 +52,14 @@
"CMAKE_CXX_COMPILER": "g++-10" "CMAKE_CXX_COMPILER": "g++-10"
} }
}, },
{
"name": "linux-gcc-12",
"inherits": "linux-base",
"cacheVariables": {
"CMAKE_C_COMPILER": "gcc-12",
"CMAKE_CXX_COMPILER": "g++-12"
}
},
{ {
"name": "macos-base", "name": "macos-base",
"hidden": true, "hidden": true,
@@ -171,6 +187,16 @@
"configuration": "Release", "configuration": "Release",
"configurePreset": "linux-clang-10" "configurePreset": "linux-clang-10"
}, },
{
"name": "linux-clang-14-debug",
"configuration": "Debug",
"configurePreset": "linux-clang-14"
},
{
"name": "linux-clang-14-release",
"configuration": "Release",
"configurePreset": "linux-clang-14"
},
{ {
"name": "linux-gcc-10-debug", "name": "linux-gcc-10-debug",
"configuration": "Debug", "configuration": "Debug",
@@ -181,6 +207,16 @@
"configuration": "Release", "configuration": "Release",
"configurePreset": "linux-gcc-10" "configurePreset": "linux-gcc-10"
}, },
{
"name": "linux-gcc-12-debug",
"configuration": "Debug",
"configurePreset": "linux-gcc-12"
},
{
"name": "linux-gcc-12-release",
"configuration": "Release",
"configurePreset": "linux-gcc-12"
},
{ {
"name": "macos-arm64-debug", "name": "macos-arm64-debug",
"configuration": "Debug", "configuration": "Debug",
@@ -252,15 +288,25 @@
}, },
"configuration": "Release" "configuration": "Release"
}, },
{
"name": "linux-clang-10-release",
"inherits": "test-base",
"configurePreset": "linux-clang-10"
},
{
"name": "linux-clang-14-release",
"inherits": "test-base",
"configurePreset": "linux-clang-14"
},
{ {
"name": "linux-gcc-10-release", "name": "linux-gcc-10-release",
"inherits": "test-base", "inherits": "test-base",
"configurePreset": "linux-gcc-10" "configurePreset": "linux-gcc-10"
}, },
{ {
"name": "linux-clang-10-release", "name": "linux-gcc-12-release",
"inherits": "test-base", "inherits": "test-base",
"configurePreset": "linux-clang-10" "configurePreset": "linux-gcc-12"
}, },
{ {
"name": "macos-arm64-release", "name": "macos-arm64-release",