Skip to content

Commit 680bf73

Browse files
authored
Merge pull request #300 from rogerfraser/1.2.9
Add new configurePresets to enable CTests to run
2 parents 338f61a + ee9e5fa commit 680bf73

File tree

1 file changed

+43
-6
lines changed

1 file changed

+43
-6
lines changed

dynadjust/CMakePresets.json

Lines changed: 43 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
1414
"VCPKG_TARGET_TRIPLET": "x64-windows",
1515
"USE_MKL": "OFF",
16-
"USE_OPENMP": "ON"
16+
"USE_OPENMP": "ON",
17+
"BUILD_TESTING":"OFF"
1718
}
1819
},
1920
{
@@ -33,15 +34,51 @@
3334
"MKL_LINK": "dynamic",
3435
"MKL_INTERFACE": "lp64",
3536
"ENABLE_SCALAPACK": "True",
36-
"BLA_VENDOR": "Intel10_64lp"
37+
"BLA_VENDOR": "Intel10_64lp",
38+
"BUILD_TESTING":"OFF"
39+
}
40+
},
41+
{
42+
"name": "vs-x64-dbg-openblas",
43+
"displayName": "VS2022 x64 (OpenBLAS)",
44+
"generator": "Visual Studio 17 2022",
45+
"architecture": { "value": "x64" },
46+
"binaryDir": "${sourceParentDir}/build/",
47+
"cacheVariables": {
48+
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
49+
"VCPKG_TARGET_TRIPLET": "x64-windows",
50+
"USE_MKL": "OFF",
51+
"USE_OPENMP": "ON",
52+
"BUILD_TESTING":"ON"
53+
}
54+
},
55+
{
56+
"name": "vs-x64-dbg-mkl",
57+
"displayName": "VS2022 x64 (Intel MKL)",
58+
"generator": "Visual Studio 17 2022",
59+
"architecture": { "value": "x64" },
60+
"binaryDir": "${sourceParentDir}/build/",
61+
"cacheVariables": {
62+
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
63+
"VCPKG_TARGET_TRIPLET": "x64-windows",
64+
"CMAKE_PREFIX_PATH": "C:\\Program Files (x86)\\Intel\\oneAPI\\mkl\\2025.2\\lib\\cmake\\mkl;$env{CMAKE_PREFIX_PATH}",
65+
"USE_MKL": "ON",
66+
"USE_OPENMP": "OFF",
67+
"MKL_ARCH": "intel64",
68+
"MKL_MPI": "intelmpi",
69+
"MKL_LINK": "dynamic",
70+
"MKL_INTERFACE": "lp64",
71+
"ENABLE_SCALAPACK": "True",
72+
"BLA_VENDOR": "Intel10_64lp",
73+
"BUILD_TESTING":"ON"
3774
}
3875
}
3976
],
4077

4178
"buildPresets": [
4279
{
4380
"name": "build-dbg-openblas",
44-
"configurePreset": "vs-x64-openblas",
81+
"configurePreset": "vs-x64-dbg-openblas",
4582
"configuration": "Debug"
4683
},
4784
{
@@ -51,7 +88,7 @@
5188
},
5289
{
5390
"name": "build-dbg-mkl",
54-
"configurePreset": "vs-x64-mkl",
91+
"configurePreset": "vs-x64-dbg-mkl",
5592
"configuration": "Debug"
5693
},
5794
{
@@ -64,12 +101,12 @@
64101
"testPresets": [
65102
{
66103
"name": "ctest-mkl",
67-
"configurePreset": "vs-x64-mkl",
104+
"configurePreset": "vs-x64-dbg-mkl",
68105
"configuration": "Debug"
69106
},
70107
{
71108
"name": "ctest-openblas",
72-
"configurePreset": "vs-x64-openblas",
109+
"configurePreset": "vs-x64-dbg-openblas",
73110
"configuration": "Debug"
74111
}
75112
]

0 commit comments

Comments
 (0)