BlackMATov/meta.hpp
1
0
Fork 0
mirror of https://github.com/BlackMATov/meta.hpp.git synced 2025-12-14 19:41:29 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix cmake presets

Browse Source
This commit is contained in:
BlackMATov
2022-11-06 20:46:21 +07:00
parent f92ee24fbc
commit a0119d38b6
3 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/darwin.yml vendored
View File

@@ -18,6 +18,8 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
submodules: recursive submodules: recursive
- name: Install ninja by Homebrew
run: brew install ninja
- name: Select Xcode - name: Select Xcode
run: sudo xcode-select --switch "/Applications/Xcode_${{matrix.config.xcode}}.app" run: sudo xcode-select --switch "/Applications/Xcode_${{matrix.config.xcode}}.app"
- name: Build && Test - name: Build && Test

10
.github/workflows/windows.yml vendored
View File

@@ -10,11 +10,11 @@ jobs:
matrix: matrix:
config: config:
# https://github.com/actions/virtual-environments/tree/main/images/win # https://github.com/actions/virtual-environments/tree/main/images/win
- { os: "windows-2019", vs: "msvc2019", arch: "x86" } - { os: "windows-2019", vc: "msvc2019", arch: "x86" }
- { os: "windows-2019", vs: "msvc2019", arch: "x64" } - { os: "windows-2019", vc: "msvc2019", arch: "x64" }
- { os: "windows-2022", vs: "msvc2022", arch: "x86" } - { os: "windows-2022", vc: "msvc2022", arch: "x86" }
- { os: "windows-2022", vs: "msvc2022", arch: "x64" } - { os: "windows-2022", vc: "msvc2022", arch: "x64" }
name: "${{matrix.config.vs}} ${{matrix.config.arch}}" name: "${{matrix.config.vc}} ${{matrix.config.arch}}"
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:

28
CMakePresets.json
View File

@@ -29,7 +29,7 @@
} }
}, },
{ {
"name": "linux-clang10", "name": "linux-clang-10",
"inherits": "linux-base", "inherits": "linux-base",
"cacheVariables": { "cacheVariables": {
"CMAKE_C_COMPILER": "clang-10", "CMAKE_C_COMPILER": "clang-10",
@@ -37,7 +37,7 @@
} }
}, },
{ {
"name": "linux-gcc10", "name": "linux-gcc-10",
"inherits": "linux-base", "inherits": "linux-base",
"cacheVariables": { "cacheVariables": {
"CMAKE_C_COMPILER": "gcc-10", "CMAKE_C_COMPILER": "gcc-10",
@@ -162,24 +162,24 @@
"buildPresets": [ "buildPresets": [
{ {
"name": "linux-clang10-debug", "name": "linux-clang-10-debug",
"configuration": "Debug", "configuration": "Debug",
"configurePreset": "linux-clang10" "configurePreset": "linux-clang-10"
}, },
{ {
"name": "linux-clang10-release", "name": "linux-clang-10-release",
"configuration": "Release", "configuration": "Release",
"configurePreset": "linux-clang10" "configurePreset": "linux-clang-10"
}, },
{ {
"name": "linux-gcc10-debug", "name": "linux-gcc-10-debug",
"configuration": "Debug", "configuration": "Debug",
"configurePreset": "linux-gcc10" "configurePreset": "linux-gcc-10"
}, },
{ {
"name": "linux-gcc10-release", "name": "linux-gcc-10-release",
"configuration": "Release", "configuration": "Release",
"configurePreset": "linux-gcc10" "configurePreset": "linux-gcc-10"
}, },
{ {
"name": "macos-arm64-debug", "name": "macos-arm64-debug",
@@ -245,14 +245,14 @@
"testPresets": [ "testPresets": [
{ {
"name": "linux-gcc10-release", "name": "linux-gcc-10-release",
"configuration": "Release", "configuration": "Release",
"configurePreset": "linux-gcc10" "configurePreset": "linux-gcc-10"
}, },
{ {
"name": "linux-clang10-release", "name": "linux-clang-10-release",
"configuration": "Release", "configuration": "Release",
"configurePreset": "linux-clang10" "configurePreset": "linux-clang-10"
}, },
{ {
"name": "macos-arm64-release", "name": "macos-arm64-release",