Skip to content

Commit

Permalink
fix: Benchmark preset uses clang16 (#1902)
Browse files Browse the repository at this point in the history
Without this, the benchmark preset fails to buid for older version of
clang.

# Checklist:
Remove the checklist to signal you've completed it. Enable auto-merge if
the PR is ready to merge.
- [x] If the pull request requires a cryptography review (e.g.
cryptographic algorithm implementations) I have added the 'crypto' tag.
- [x] I have reviewed my diff in github, line by line and removed
unexpected formatting changes, testing logs, or commented-out code.
- [x] Every change is related to the PR description.
- [x] I have
[linked](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)
this pull request to relevant issues (if any exist).
  • Loading branch information
codygunton authored Aug 31, 2023
1 parent a248dae commit 4f7eeea
Showing 1 changed file with 20 additions and 20 deletions.
40 changes: 20 additions & 20 deletions circuits/cpp/barretenberg/cpp/CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,20 @@
}
},
{
"name": "clang15",
"displayName": "Build with Clang-15",
"description": "Build with globally installed Clang-15",
"name": "clang16",
"displayName": "Build with Clang-16",
"description": "Build with globally installed Clang-16",
"inherits": "default",
"environment": {
"CC": "clang-15",
"CXX": "clang++-15"
"CC": "clang-16",
"CXX": "clang++-16"
}
},
{
"name": "clang15-dbg",
"displayName": "Debugging build with Clang-15",
"description": "Build with globally installed Clang-15 in debug mode",
"inherits": "clang15",
"name": "clang16-dbg",
"displayName": "Debugging build with Clang-16",
"description": "Build with globally installed Clang-16 in debug mode",
"inherits": "clang16",
"environment": {
"CMAKE_BUILD_TYPE": "Debug"
},
Expand Down Expand Up @@ -75,7 +75,7 @@
"name": "bench",
"displayName": "Build benchmarks",
"description": "Build default preset but with a special benchmark directory",
"inherits": "default",
"inherits": "clang16",
"binaryDir": "build-bench"
},
{
Expand Down Expand Up @@ -161,14 +161,14 @@
"configurePreset": "homebrew"
},
{
"name": "clang15",
"name": "clang16",
"inherits": "default",
"configurePreset": "clang15"
"configurePreset": "clang16"
},
{
"name": "clang15-dbg",
"name": "clang16-dbg",
"inherits": "default",
"configurePreset": "clang15-dbg"
"configurePreset": "clang16-dbg"
},
{
"name": "gcc",
Expand All @@ -182,7 +182,7 @@
},
{
"name": "bench",
"inherits": "default",
"inherits": "clang16",
"configurePreset": "bench"
},
{
Expand Down Expand Up @@ -229,14 +229,14 @@
"configurePreset": "homebrew"
},
{
"name": "clang15",
"name": "clang16",
"inherits": "default",
"configurePreset": "clang15"
"configurePreset": "clang16"
},
{
"name": "clang15-dbg",
"name": "clang16-dbg",
"inherits": "default",
"configurePreset": "clang15-dbg"
"configurePreset": "clang16-dbg"
},
{
"name": "gcc",
Expand All @@ -250,7 +250,7 @@
},
{
"name": "bench",
"inherits": "default",
"inherits": "clang16",
"configurePreset": "bench"
},
{
Expand Down

0 comments on commit 4f7eeea

Please sign in to comment.