Integrate Refactor solver sources and dual MSVC CMake builds
This commit is contained in:
+21
-7
@@ -3,11 +3,11 @@
|
||||
"configurePresets": [
|
||||
{
|
||||
"name": "windows-msvc-ninja-debug",
|
||||
"displayName": "Windows MSVC x64 Debug (Ninja)",
|
||||
"generator": "Ninja",
|
||||
"binaryDir": "${sourceDir}/build/windows-msvc-ninja-debug",
|
||||
"binaryDir": "${sourceDir}/.build/cmake-debug",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Debug",
|
||||
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
|
||||
"FESA_GTEST_SOURCE_DIR": "$env{FESA_GTEST_SOURCE_DIR}",
|
||||
"MKL_DIR": "$env{MKL_DIR}",
|
||||
"TBB_DIR": "$env{TBB_DIR}",
|
||||
@@ -16,11 +16,15 @@
|
||||
},
|
||||
{
|
||||
"name": "windows-msvc-ninja-release",
|
||||
"displayName": "Windows MSVC x64 Release with symbols (Ninja)",
|
||||
"inherits": "windows-msvc-ninja-debug",
|
||||
"binaryDir": "${sourceDir}/build/windows-msvc-ninja-release",
|
||||
"generator": "Ninja",
|
||||
"binaryDir": "${sourceDir}/.build/cmake-release",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Release"
|
||||
"CMAKE_BUILD_TYPE": "Release",
|
||||
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
|
||||
"FESA_GTEST_SOURCE_DIR": "$env{FESA_GTEST_SOURCE_DIR}",
|
||||
"MKL_DIR": "$env{MKL_DIR}",
|
||||
"TBB_DIR": "$env{TBB_DIR}",
|
||||
"HDF5_DIR": "$env{HDF5_DIR}"
|
||||
}
|
||||
}
|
||||
],
|
||||
@@ -37,7 +41,17 @@
|
||||
"testPresets": [
|
||||
{
|
||||
"name": "windows-msvc-ninja-debug",
|
||||
"configurePreset": "windows-msvc-ninja-debug"
|
||||
"configurePreset": "windows-msvc-ninja-debug",
|
||||
"output": {
|
||||
"outputOnFailure": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "windows-msvc-ninja-release",
|
||||
"configurePreset": "windows-msvc-ninja-release",
|
||||
"output": {
|
||||
"outputOnFailure": true
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user