Skip to content

Commit 8b511ae

Browse files
authored
Minor CMake code review (#278)
1 parent f84623a commit 8b511ae

File tree

1 file changed

+38
-15
lines changed

1 file changed

+38
-15
lines changed

CMakePresets.json

Lines changed: 38 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
{
22
"version": 3,
3+
"cmakeMinimumRequired": {
4+
"major": 3,
5+
"minor": 21
6+
},
37
"configurePresets": [
48
{
59
"name": "base",
@@ -10,14 +14,15 @@
1014
"binaryDir": "${sourceDir}/out/build/${presetName}",
1115
"installDir": "${sourceDir}/out/install/${presetName}"
1216
},
13-
1417
{
1518
"name": "x64",
1619
"architecture": {
1720
"value": "x64",
1821
"strategy": "external"
1922
},
20-
"cacheVariables": { "DXMATH_ARCHITECTURE": "x64" },
23+
"cacheVariables": {
24+
"DXMATH_ARCHITECTURE": "x64"
25+
},
2126
"hidden": true
2227
},
2328
{
@@ -26,7 +31,9 @@
2631
"value": "x86",
2732
"strategy": "external"
2833
},
29-
"cacheVariables": { "DXMATH_ARCHITECTURE": "x86" },
34+
"cacheVariables": {
35+
"DXMATH_ARCHITECTURE": "x86"
36+
},
3037
"hidden": true
3138
},
3239
{
@@ -35,7 +42,9 @@
3542
"value": "arm64",
3643
"strategy": "external"
3744
},
38-
"cacheVariables": { "DXMATH_ARCHITECTURE": "arm64" },
45+
"cacheVariables": {
46+
"DXMATH_ARCHITECTURE": "arm64"
47+
},
3948
"hidden": true
4049
},
4150
{
@@ -44,51 +53,64 @@
4453
"value": "arm64ec",
4554
"strategy": "external"
4655
},
47-
"cacheVariables": { "DXMATH_ARCHITECTURE": "arm64ec" },
56+
"cacheVariables": {
57+
"DXMATH_ARCHITECTURE": "arm64ec"
58+
},
4859
"environment": {
4960
"CFLAGS": "/arm64EC",
5061
"CXXFLAGS": "/arm64EC"
5162
},
5263
"hidden": true
5364
},
54-
5565
{
5666
"name": "Debug",
57-
"cacheVariables": { "CMAKE_BUILD_TYPE": "Debug" },
67+
"cacheVariables": {
68+
"CMAKE_BUILD_TYPE": "Debug"
69+
},
5870
"hidden": true
5971
},
6072
{
6173
"name": "Release",
62-
"cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo" },
74+
"cacheVariables": {
75+
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
76+
},
6377
"hidden": true
6478
},
65-
6679
{
6780
"name": "OneCore",
68-
"cacheVariables": { "BUILD_FOR_ONECORE": true },
81+
"cacheVariables": {
82+
"BUILD_FOR_ONECORE": true
83+
},
6984
"hidden": true
7085
},
7186
{
7287
"name": "AVX",
73-
"cacheVariables": { "BUILD_AVX_TEST": true },
88+
"cacheVariables": {
89+
"BUILD_AVX_TEST": true
90+
},
7491
"hidden": true
7592
},
7693
{
7794
"name": "AVX2",
78-
"cacheVariables": { "BUILD_AVX2_TEST": true },
95+
"cacheVariables": {
96+
"BUILD_AVX2_TEST": true
97+
},
7998
"hidden": true
8099
},
81100
{
82101
"name": "F16C",
83-
"cacheVariables": { "BUILD_F16C_TEST": true },
102+
"cacheVariables": {
103+
"BUILD_F16C_TEST": true
104+
},
84105
"hidden": true
85106
},
86107
{
87108
"name": "NI",
88-
"cacheVariables": { "BUILD_NO_INTRINSICS": true },
109+
"cacheVariables": {
110+
"BUILD_NO_INTRINSICS": true
111+
},
89112
"hidden": true
90113
},
91-
92114
{
93115
"name": "MSVC",
94116
"hidden": true,
@@ -199,6 +221,7 @@
199221
{ "name": "x64-Debug-Linux" , "description": "WSL x64 (Debug) - SSE/SSE2", "inherits": [ "base", "x64", "Debug" ] },
200222
{ "name": "x64-Release-Linux" , "description": "WSL x64 (Release) - SSE/SSE2", "inherits": [ "base", "x64", "Release" ] }
201223
],
224+
202225
"testPresets": [
203226
{ "name": "x64-Debug" , "configurePreset": "x64-Debug" },
204227
{ "name": "x64-Release" , "configurePreset": "x64-Release" },

0 commit comments

Comments
 (0)