From 59ac01ae41acb0794d7abef833bb9376cfd04f98 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Tue, 27 Dec 2022 03:06:17 +0700 Subject: [PATCH] fix clang/gcc cmake presets --- .github/workflows/linux.yml | 2 +- CMakePresets.json | 50 +++++++++++++++++++++++++++++++++++-- 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 8849b22..2c934cc 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -13,7 +13,7 @@ jobs: - { os: "ubuntu-20.04", cc: "gcc-10", cxx: "g++-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: "clang-15", cxx: "clang++-15" } + - { os: "ubuntu-22.04", cc: "clang-14", cxx: "clang++-14" } name: "${{matrix.config.cxx}}" steps: - name: Setup diff --git a/CMakePresets.json b/CMakePresets.json index e226fc8..8df8146 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -36,6 +36,14 @@ "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", "inherits": "linux-base", @@ -44,6 +52,14 @@ "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", "hidden": true, @@ -171,6 +187,16 @@ "configuration": "Release", "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", "configuration": "Debug", @@ -181,6 +207,16 @@ "configuration": "Release", "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", "configuration": "Debug", @@ -252,15 +288,25 @@ }, "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", "inherits": "test-base", "configurePreset": "linux-gcc-10" }, { - "name": "linux-clang-10-release", + "name": "linux-gcc-12-release", "inherits": "test-base", - "configurePreset": "linux-clang-10" + "configurePreset": "linux-gcc-12" }, { "name": "macos-arm64-release",