Skip to content

Fix badly-merged CMakePresets.json file #6936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
steven-johnson merged 1 commit into from
Aug 12, 2022
Merged

Fix badly-merged CMakePresets.json file #6936

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 19 additions & 23 deletions CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{
"name": "ci",
"hidden": true,
"inherits": "default",
"inherits": "base",
"toolchainFile": "${sourceDir}/cmake/toolchain.${presetName}.cmake",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
Expand Down Expand Up @@ -165,28 +165,6 @@
}
}
],
"buildPresets": [
{
"name": "linux-x64-asan",
"configurePreset": "linux-x64-asan",
"displayName": "ASAN (Linux x64)",
"description": "Build everything with ASAN enabled"
}
],
"testPresets": [
{
"name": "linux-x64-asan",
"configurePreset": "linux-x64-asan",
"displayName": "ASAN (Linux x64)",
"description": "Test everything with ASAN enabled",
"environment": {
"ASAN_OPTIONS": "detect_leaks=0:detect_container_overflow=0"
},
"output": {
"outputOnFailure": true
}
}
],
"buildPresets": [
{
"name": "debug",
Expand All @@ -199,6 +177,12 @@
"configurePreset": "release",
"displayName": "Release",
"description": "Release build with no special settings"
},
{
"name": "linux-x64-asan",
"configurePreset": "linux-x64-asan",
"displayName": "ASAN (Linux x64)",
"description": "Build everything with ASAN enabled"
}
],
"testPresets": [
Expand All @@ -219,6 +203,18 @@
"output": {
"outputOnFailure": true
}
},
{
"name": "linux-x64-asan",
"configurePreset": "linux-x64-asan",
"displayName": "ASAN (Linux x64)",
"description": "Test everything with ASAN enabled",
"environment": {
"ASAN_OPTIONS": "detect_leaks=0:detect_container_overflow=0"
},
"output": {
"outputOnFailure": true
}
}
]
}