From d9539030a868cb47ff5bf82591aaa1892392db49 Mon Sep 17 00:00:00 2001 From: codygunton Date: Tue, 4 Apr 2023 01:24:43 +0000 Subject: [PATCH 1/3] Add debugging CMake preset & update code-workspace --- barretenberg.code-workspace | 1 + cpp/CMakePresets.json | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/barretenberg.code-workspace b/barretenberg.code-workspace index dc0a3c21f0..c0737c9176 100644 --- a/barretenberg.code-workspace +++ b/barretenberg.code-workspace @@ -149,6 +149,7 @@ "cmake.configureArgs": [ "--preset clang15", "-G Ninja", + "-g" ], "cmake.useCMakePresets": "auto", }, diff --git a/cpp/CMakePresets.json b/cpp/CMakePresets.json index 72144e31fc..3358e42d17 100644 --- a/cpp/CMakePresets.json +++ b/cpp/CMakePresets.json @@ -40,6 +40,17 @@ "CXX": "clang++-15" } }, + { + "name": "clang15-dbg", + "displayName": "Debugging build with Clang-15", + "description": "Build with globally installed Clang-15 in debug mode", + "inherits": "default", + "environment": { + "CC": "clang-15", + "CXX": "clang++-15", + "CMAKE_BUILD_TYPE": "Debug" + } + }, { "name": "gcc", "displayName": "Build with GCC", @@ -130,6 +141,11 @@ "inherits": "default", "configurePreset": "clang15" }, + { + "name": "clang15-dbg", + "inherits": "default", + "configurePreset": "clang15-dbg" + }, { "name": "gcc", "inherits": "default", @@ -181,6 +197,11 @@ "inherits": "default", "configurePreset": "clang15" }, + { + "name": "clang15-dbg", + "inherits": "default", + "configurePreset": "clang15-dbg" + }, { "name": "gcc", "inherits": "default", From 5b2a9c432e1235a2972a47826cbb89fa6050ac0f Mon Sep 17 00:00:00 2001 From: Cody Gunton Date: Tue, 4 Apr 2023 13:32:25 -0400 Subject: [PATCH 2/3] Update cpp/CMakePresets.json Co-authored-by: Blaine Bublitz --- cpp/CMakePresets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/CMakePresets.json b/cpp/CMakePresets.json index 3358e42d17..20ec143cd8 100644 --- a/cpp/CMakePresets.json +++ b/cpp/CMakePresets.json @@ -44,7 +44,7 @@ "name": "clang15-dbg", "displayName": "Debugging build with Clang-15", "description": "Build with globally installed Clang-15 in debug mode", - "inherits": "default", + "inherits": "clang15", "environment": { "CC": "clang-15", "CXX": "clang++-15", From 7508a7a0a6add042d6d112b36a247c2579130b09 Mon Sep 17 00:00:00 2001 From: Cody Gunton Date: Tue, 4 Apr 2023 13:32:36 -0400 Subject: [PATCH 3/3] Update cpp/CMakePresets.json Co-authored-by: Blaine Bublitz --- cpp/CMakePresets.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/cpp/CMakePresets.json b/cpp/CMakePresets.json index 20ec143cd8..91bee328c8 100644 --- a/cpp/CMakePresets.json +++ b/cpp/CMakePresets.json @@ -46,8 +46,6 @@ "description": "Build with globally installed Clang-15 in debug mode", "inherits": "clang15", "environment": { - "CC": "clang-15", - "CXX": "clang++-15", "CMAKE_BUILD_TYPE": "Debug" } },