Skip to content

Commit 5041b18

Browse files
committed
preset cleanup
1 parent 0d5e20d commit 5041b18

File tree

2 files changed

+13
-35
lines changed

2 files changed

+13
-35
lines changed

.github/workflows/ci_cmake.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
steps:
2222
- uses: actions/checkout@v2
2323

24-
- run: cmake --preset default
25-
- run: cmake --build --preset default
26-
- run: ctest --preset default
24+
- run: cmake -Bbuild
25+
- run: cmake --build build
26+
- run: ctest --test-dir build --preset default
2727

2828

2929
macos:
@@ -35,10 +35,9 @@ jobs:
3535
steps:
3636
- uses: actions/checkout@v2
3737

38-
- run: cmake --preset default
39-
- run: cmake --build --preset default
40-
- run: ctest --preset default
41-
38+
- run: cmake -Bbuild
39+
- run: cmake --build build
40+
- run: ctest --test-dir build --preset default
4241

4342
windows:
4443
needs: linux
@@ -49,6 +48,6 @@ jobs:
4948
steps:
5049
- uses: actions/checkout@v2
5150

52-
- run: cmake --preset default
53-
- run: cmake --build --preset default
54-
- run: ctest --preset default
51+
- run: cmake -Bbuild
52+
- run: cmake --build build
53+
- run: ctest --test-dir build --preset default

CMakePresets.json

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,16 @@
33

44
"configurePresets": [
55
{
6-
"name": "default",
7-
"binaryDir": "${sourceDir}/build"
8-
},
9-
{
10-
"name": "multi", "inherits": "default",
6+
"name": "multi",
7+
"binaryDir": "${sourceDir}/build",
118
"displayName": "Ninja Multi-Config",
129
"generator": "Ninja Multi-Config"
1310
},
1411
{
15-
"name": "intel", "inherits": "default",
16-
"displayName": "Intel oneAPI compiler",
17-
"binaryDir": "${sourceDir}/build-intel",
18-
"environment": {
19-
"CC": "icx",
20-
"FC": "ifx"
21-
}
12+
"name": "phony"
2213
}
2314
],
2415
"buildPresets": [
25-
{
26-
"name": "default",
27-
"configurePreset": "default"
28-
},
2916
{
3017
"name": "release",
3118
"configurePreset": "multi",
@@ -35,16 +22,12 @@
3522
"name": "debug",
3623
"configurePreset": "multi",
3724
"configuration": "Debug"
38-
},
39-
{
40-
"name": "intel",
41-
"configurePreset": "intel"
4225
}
4326
],
4427
"testPresets": [
4528
{
4629
"name": "default",
47-
"configurePreset": "default",
30+
"configurePreset": "phony",
4831
"output": {
4932
"outputOnFailure": true,
5033
"verbosity": "default"
@@ -63,10 +46,6 @@
6346
"name": "debug", "inherits": "default",
6447
"configurePreset": "multi",
6548
"configuration": "Debug"
66-
},
67-
{
68-
"name": "intel", "inherits": "default",
69-
"configurePreset": "intel"
7049
}
7150
]
7251
}

0 commit comments

Comments
 (0)