From 03e11d1f959e77d6a7bbe02855748eb3b0050bdc Mon Sep 17 00:00:00 2001 From: River <26424577+wusatosi@users.noreply.github.com> Date: Tue, 19 Nov 2024 21:28:12 -0500 Subject: [PATCH 01/13] update ci --- .github/workflows/ci_tests.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 7c62dd5..5fea49e 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -12,11 +12,15 @@ on: jobs: preset-test: - runs-on: ubuntu-latest strategy: matrix: - preset: ["gcc-debug", "gcc-release"] - name: "Preset: ${{ matrix.preset }}" + presets: + - preset: "gcc-debug" + platform: "ubuntu-latest" + - preset: "gcc-release" + platform: "ubuntu-latest" + name: "Preset: ${{ matrix.presets.preset }} on ${{ matrix.presets.platform }}" + runs-on: ${{ matrix.presets.platform }} steps: - uses: actions/checkout@v4 - name: Setup build environment @@ -25,7 +29,7 @@ jobs: cmakeVersion: "~3.25.0" ninjaVersion: "^1.11.1" - name: Run preset - run: cmake --workflow --preset ${{ matrix.preset }} + run: cmake --workflow --preset ${{ matrix.presets.preset }} gtest-test: strategy: From 748d49ba3d78207d4c639d5f21fb88f55594c6fa Mon Sep 17 00:00:00 2001 From: River <26424577+wusatosi@users.noreply.github.com> Date: Tue, 19 Nov 2024 22:04:00 -0500 Subject: [PATCH 02/13] add xcode-debug --- .github/workflows/ci_tests.yml | 2 ++ CMakePresets.json | 53 +++++++++++++++++++++++++--------- 2 files changed, 42 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 5fea49e..d68f86c 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -19,6 +19,8 @@ jobs: platform: "ubuntu-latest" - preset: "gcc-release" platform: "ubuntu-latest" + - preset: "xcode-debug" + platform: "macos-latest" name: "Preset: ${{ matrix.presets.preset }} on ${{ matrix.presets.platform }}" runs-on: ${{ matrix.presets.platform }} steps: diff --git a/CMakePresets.json b/CMakePresets.json index ede9472..fad4f19 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -10,14 +10,6 @@ "CMAKE_CXX_STANDARD": "17" } }, - { - "name": "_debug-base", - "hidden": true, - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_CXX_FLAGS": "-fsanitize=address -fsanitize=pointer-compare -fsanitize=pointer-subtract -fsanitize=leak -fsanitize=undefined" - } - }, { "name": "_release-base", "hidden": true, @@ -29,12 +21,11 @@ { "name": "gcc-debug", "displayName": "GCC Debug Build", - "inherits": [ - "_root-config", - "_debug-base" - ], + "inherits": ["_root-config"], "cacheVariables": { - "CMAKE_CXX_COMPILER": "g++" + "CMAKE_CXX_COMPILER": "g++", + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_CXX_FLAGS": "-fsanitize=address -fsanitize=pointer-compare -fsanitize=pointer-subtract -fsanitize=leak -fsanitize=undefined" } }, { @@ -47,6 +38,16 @@ "cacheVariables": { "CMAKE_CXX_COMPILER": "g++" } + }, + { + "name": "xcode-debug", + "displayName": "XCode Debug Build", + "inherits": ["_root-config"], + "cacheVariables": { + "CMAKE_CXX_COMPILER": "g++", + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_CXX_FLAGS": "-fsanitize=address -fsanitize=pointer-compare -fsanitize=pointer-subtract -fsanitize=undefined" + } } ], "buildPresets": [ @@ -57,6 +58,10 @@ { "name": "gcc-release", "configurePreset": "gcc-release" + }, + { + "name": "xcode-debug", + "configurePreset": "xcode-debug" } ], "testPresets": [ @@ -80,6 +85,11 @@ "name": "gcc-release", "inherits": "_test_base", "configurePreset": "gcc-release" + }, + { + "name": "xcode-debug", + "inherits": "_test_base", + "configurePreset": "xcode-debug" } ], "workflowPresets": [ @@ -116,6 +126,23 @@ "name": "gcc-release" } ] + }, + { + "name": "xcode-debug", + "steps": [ + { + "type": "configure", + "name": "xcode-debug" + }, + { + "type": "build", + "name": "xcode-debug" + }, + { + "type": "test", + "name": "xcode-debug" + } + ] } ] } From b062657740874dae2e0af9ad9453979e2f4344c5 Mon Sep 17 00:00:00 2001 From: River <26424577+wusatosi@users.noreply.github.com> Date: Tue, 19 Nov 2024 22:07:36 -0500 Subject: [PATCH 03/13] add xcode-release --- .github/workflows/ci_tests.yml | 2 ++ CMakePresets.json | 39 +++++++++++++++++++++++++++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index d68f86c..ce125f7 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -21,6 +21,8 @@ jobs: platform: "ubuntu-latest" - preset: "xcode-debug" platform: "macos-latest" + - preset: "xcode-release" + platform: "macos-latest" name: "Preset: ${{ matrix.presets.preset }} on ${{ matrix.presets.platform }}" runs-on: ${{ matrix.presets.platform }} steps: diff --git a/CMakePresets.json b/CMakePresets.json index fad4f19..2e47e1c 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -41,13 +41,24 @@ }, { "name": "xcode-debug", - "displayName": "XCode Debug Build", + "displayName": "xcode Debug Build", "inherits": ["_root-config"], "cacheVariables": { "CMAKE_CXX_COMPILER": "g++", "CMAKE_BUILD_TYPE": "Debug", "CMAKE_CXX_FLAGS": "-fsanitize=address -fsanitize=pointer-compare -fsanitize=pointer-subtract -fsanitize=undefined" } + }, + { + "name": "xcode-release", + "displayName": "xcode Release Build", + "inherits": [ + "_root-config", + "_release-base" + ], + "cacheVariables": { + "CMAKE_CXX_COMPILER": "g++" + } } ], "buildPresets": [ @@ -62,6 +73,10 @@ { "name": "xcode-debug", "configurePreset": "xcode-debug" + }, + { + "name": "xcode-release", + "configurePreset": "xcode-release" } ], "testPresets": [ @@ -90,6 +105,11 @@ "name": "xcode-debug", "inherits": "_test_base", "configurePreset": "xcode-debug" + }, + { + "name": "xcode-release", + "inherits": "_test_base", + "configurePreset": "xcode-release" } ], "workflowPresets": [ @@ -143,6 +163,23 @@ "name": "xcode-debug" } ] + }, + { + "name": "xcode-release", + "steps": [ + { + "type": "configure", + "name": "xcode-release" + }, + { + "type": "build", + "name": "xcode-release" + }, + { + "type": "test", + "name": "xcode-release" + } + ] } ] } From 2bec3b35ebf6b597a390c2e2f610002692661a45 Mon Sep 17 00:00:00 2001 From: River <26424577+wusatosi@users.noreply.github.com> Date: Tue, 19 Nov 2024 22:29:29 -0500 Subject: [PATCH 04/13] add msvc --- .github/workflows/ci_tests.yml | 4 ++ CMakePresets.json | 76 +++++++++++++++++++++++++++++++++- 2 files changed, 79 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index ce125f7..ea6b054 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -23,6 +23,10 @@ jobs: platform: "macos-latest" - preset: "xcode-release" platform: "macos-latest" + - preset: "msvc-debug" + platform: "windows-latest" + - preset: "msvc-release" + platform: "windows-latest" name: "Preset: ${{ matrix.presets.preset }} on ${{ matrix.presets.platform }}" runs-on: ${{ matrix.presets.platform }} steps: diff --git a/CMakePresets.json b/CMakePresets.json index 2e47e1c..8dc287d 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -36,7 +36,9 @@ "_release-base" ], "cacheVariables": { - "CMAKE_CXX_COMPILER": "g++" + "CMAKE_CXX_COMPILER": "g++", + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_CXX_FLAGS": "-fsanitize=address -fsanitize=pointer-compare -fsanitize=pointer-subtract -fsanitize=leak -fsanitize=undefined" } }, { @@ -59,6 +61,26 @@ "cacheVariables": { "CMAKE_CXX_COMPILER": "g++" } + }, + { + "name": "msvc-debug", + "displayName": "MSVC Debug Build", + "inherits": ["_root-config"], + "cacheVariables": { + "CMAKE_CXX_COMPILER": "cl", + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_CXX_FLAGS": "/fsanitize=address /Zi" + } + }, + { + "name": "msvc-release", + "displayName": "MSVC Release Build", + "inherits": ["_root-config"], + "cacheVariables": { + "CMAKE_CXX_COMPILER": "cl", + "CMAKE_BUILD_TYPE": "RelWithDebInfo", + "CMAKE_CXX_FLAGS": "/O2" + } } ], "buildPresets": [ @@ -77,6 +99,14 @@ { "name": "xcode-release", "configurePreset": "xcode-release" + }, + { + "name": "msvc-debug", + "configurePreset": "msvc-debug" + }, + { + "name": "msvc-release", + "configurePreset": "msvc-release" } ], "testPresets": [ @@ -110,6 +140,16 @@ "name": "xcode-release", "inherits": "_test_base", "configurePreset": "xcode-release" + }, + { + "name": "msvc-debug", + "inherits": "_test_base", + "configurePreset": "msvc-debug" + }, + { + "name": "msvc-release", + "inherits": "_test_base", + "configurePreset": "msvc-release" } ], "workflowPresets": [ @@ -180,6 +220,40 @@ "name": "xcode-release" } ] + }, + { + "name": "msvc-debug", + "steps": [ + { + "type": "configure", + "name": "msvc-debug" + }, + { + "type": "build", + "name": "msvc-debug" + }, + { + "type": "test", + "name": "msvc-debug" + } + ] + }, + { + "name": "msvc-release", + "steps": [ + { + "type": "configure", + "name": "msvc-release" + }, + { + "type": "build", + "name": "msvc-release" + }, + { + "type": "test", + "name": "msvc-release" + } + ] } ] } From 069a47e6dd843a409c0ca8aa651cb6b858e5f176 Mon Sep 17 00:00:00 2001 From: River <26424577+wusatosi@users.noreply.github.com> Date: Tue, 19 Nov 2024 22:32:06 -0500 Subject: [PATCH 05/13] use setup msvc --- .github/workflows/ci_tests.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index ea6b054..d8be691 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -36,6 +36,11 @@ jobs: with: cmakeVersion: "~3.25.0" ninjaVersion: "^1.11.1" + - name: Setup MSVC + if: startsWith(matrix.presets.platform, 'windows') + uses: TheMrMilchmann/setup-msvc-dev@v3 + with: + arch: x64 - name: Run preset run: cmake --workflow --preset ${{ matrix.presets.preset }} From 3a6abdb95d13f9da57d8803a02ad99f15958fae6 Mon Sep 17 00:00:00 2001 From: River <26424577+wusatosi@users.noreply.github.com> Date: Sun, 24 Nov 2024 21:26:57 -0500 Subject: [PATCH 06/13] Update CMakePresets.json --- CMakePresets.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 8dc287d..c6f0966 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -36,9 +36,7 @@ "_release-base" ], "cacheVariables": { - "CMAKE_CXX_COMPILER": "g++", - "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_CXX_FLAGS": "-fsanitize=address -fsanitize=pointer-compare -fsanitize=pointer-subtract -fsanitize=leak -fsanitize=undefined" + "CMAKE_CXX_COMPILER": "g++" } }, { From 94363103685017ff6be7cb123aa29678ded53a7d Mon Sep 17 00:00:00 2001 From: River <26424577+wusatosi@users.noreply.github.com> Date: Thu, 5 Dec 2024 17:19:37 -0500 Subject: [PATCH 07/13] bring back debug_base --- CMakePresets.json | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index c6f0966..a0399a2 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -10,6 +10,13 @@ "CMAKE_CXX_STANDARD": "17" } }, + { + "name": "_debug-base", + "hidden": true, + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug" + } + }, { "name": "_release-base", "hidden": true, @@ -21,7 +28,10 @@ { "name": "gcc-debug", "displayName": "GCC Debug Build", - "inherits": ["_root-config"], + "inherits": [ + "_root-config", + "_debug-base" + ], "cacheVariables": { "CMAKE_CXX_COMPILER": "g++", "CMAKE_BUILD_TYPE": "Debug", @@ -42,7 +52,10 @@ { "name": "xcode-debug", "displayName": "xcode Debug Build", - "inherits": ["_root-config"], + "inherits": [ + "_root-config", + "_debug-base" + ], "cacheVariables": { "CMAKE_CXX_COMPILER": "g++", "CMAKE_BUILD_TYPE": "Debug", @@ -63,11 +76,14 @@ { "name": "msvc-debug", "displayName": "MSVC Debug Build", - "inherits": ["_root-config"], + "inherits": [ + "_root-config", + "_debug-base" + ], "cacheVariables": { "CMAKE_CXX_COMPILER": "cl", "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_CXX_FLAGS": "/fsanitize=address /Zi" + "CMAKE_CXX_FLAGS": "/permissive- /fsanitize=address /Zi" } }, { @@ -77,7 +93,7 @@ "cacheVariables": { "CMAKE_CXX_COMPILER": "cl", "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "CMAKE_CXX_FLAGS": "/O2" + "CMAKE_CXX_FLAGS": "/permissive- /O2" } } ], From 41f718613e57c691beb6edb55adea88a37a58afc Mon Sep 17 00:00:00 2001 From: River <26424577+wusatosi@users.noreply.github.com> Date: Sat, 7 Dec 2024 15:35:44 -0500 Subject: [PATCH 08/13] adds /EHsc --- CMakePresets.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index a0399a2..13cb256 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -83,7 +83,7 @@ "cacheVariables": { "CMAKE_CXX_COMPILER": "cl", "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_CXX_FLAGS": "/permissive- /fsanitize=address /Zi" + "CMAKE_CXX_FLAGS": "/EHsc /permissive- /fsanitize=address /Zi" } }, { @@ -93,7 +93,7 @@ "cacheVariables": { "CMAKE_CXX_COMPILER": "cl", "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "CMAKE_CXX_FLAGS": "/permissive- /O2" + "CMAKE_CXX_FLAGS": "/EHsc /permissive- /O2" } } ], From 96a9e3593b040ce28e50fe2afe530b893adca136 Mon Sep 17 00:00:00 2001 From: River <26424577+wusatosi@users.noreply.github.com> Date: Sat, 7 Dec 2024 15:38:19 -0500 Subject: [PATCH 09/13] Apply suggestions from code review Co-authored-by: David Sankel --- CMakePresets.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 13cb256..245aa10 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -57,7 +57,7 @@ "_debug-base" ], "cacheVariables": { - "CMAKE_CXX_COMPILER": "g++", + "CMAKE_CXX_COMPILER": "clang++", "CMAKE_BUILD_TYPE": "Debug", "CMAKE_CXX_FLAGS": "-fsanitize=address -fsanitize=pointer-compare -fsanitize=pointer-subtract -fsanitize=undefined" } @@ -70,7 +70,7 @@ "_release-base" ], "cacheVariables": { - "CMAKE_CXX_COMPILER": "g++" + "CMAKE_CXX_COMPILER": "clang++" } }, { From ad365b4490d9f34f8f60a4976364d01f1aef11c6 Mon Sep 17 00:00:00 2001 From: River <26424577+wusatosi@users.noreply.github.com> Date: Wed, 11 Dec 2024 12:17:06 -0500 Subject: [PATCH 10/13] update _release-base --- CMakePresets.json | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 245aa10..dc50cf1 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -21,8 +21,7 @@ "name": "_release-base", "hidden": true, "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "CMAKE_CXX_FLAGS": "-O3" + "CMAKE_BUILD_TYPE": "RelWithDebInfo" } }, { @@ -34,7 +33,6 @@ ], "cacheVariables": { "CMAKE_CXX_COMPILER": "g++", - "CMAKE_BUILD_TYPE": "Debug", "CMAKE_CXX_FLAGS": "-fsanitize=address -fsanitize=pointer-compare -fsanitize=pointer-subtract -fsanitize=leak -fsanitize=undefined" } }, @@ -46,7 +44,8 @@ "_release-base" ], "cacheVariables": { - "CMAKE_CXX_COMPILER": "g++" + "CMAKE_CXX_COMPILER": "g++", + "CMAKE_CXX_FLAGS": "-O3" } }, { @@ -58,7 +57,6 @@ ], "cacheVariables": { "CMAKE_CXX_COMPILER": "clang++", - "CMAKE_BUILD_TYPE": "Debug", "CMAKE_CXX_FLAGS": "-fsanitize=address -fsanitize=pointer-compare -fsanitize=pointer-subtract -fsanitize=undefined" } }, @@ -70,7 +68,8 @@ "_release-base" ], "cacheVariables": { - "CMAKE_CXX_COMPILER": "clang++" + "CMAKE_CXX_COMPILER": "clang++", + "CMAKE_CXX_FLAGS": "-O3" } }, { @@ -89,10 +88,12 @@ { "name": "msvc-release", "displayName": "MSVC Release Build", - "inherits": ["_root-config"], + "inherits": [ + "_root-config", + "_release-base" + ], "cacheVariables": { "CMAKE_CXX_COMPILER": "cl", - "CMAKE_BUILD_TYPE": "RelWithDebInfo", "CMAKE_CXX_FLAGS": "/EHsc /permissive- /O2" } } From b01929eb603c02778003cf6bb22f26d666e18af5 Mon Sep 17 00:00:00 2001 From: River <26424577+wusatosi@users.noreply.github.com> Date: Wed, 11 Dec 2024 12:19:41 -0500 Subject: [PATCH 11/13] xcode->appleclang --- .github/workflows/ci_tests.yml | 4 ++-- CMakePresets.json | 36 +++++++++++++++++----------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index d8be691..8347c54 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -19,9 +19,9 @@ jobs: platform: "ubuntu-latest" - preset: "gcc-release" platform: "ubuntu-latest" - - preset: "xcode-debug" + - preset: "appleclang-debug" platform: "macos-latest" - - preset: "xcode-release" + - preset: "appleclang-release" platform: "macos-latest" - preset: "msvc-debug" platform: "windows-latest" diff --git a/CMakePresets.json b/CMakePresets.json index dc50cf1..201286f 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -49,7 +49,7 @@ } }, { - "name": "xcode-debug", + "name": "appleclang-debug", "displayName": "xcode Debug Build", "inherits": [ "_root-config", @@ -61,7 +61,7 @@ } }, { - "name": "xcode-release", + "name": "appleclang-release", "displayName": "xcode Release Build", "inherits": [ "_root-config", @@ -108,12 +108,12 @@ "configurePreset": "gcc-release" }, { - "name": "xcode-debug", - "configurePreset": "xcode-debug" + "name": "appleclang-debug", + "configurePreset": "appleclang-debug" }, { - "name": "xcode-release", - "configurePreset": "xcode-release" + "name": "appleclang-release", + "configurePreset": "appleclang-release" }, { "name": "msvc-debug", @@ -147,14 +147,14 @@ "configurePreset": "gcc-release" }, { - "name": "xcode-debug", + "name": "appleclang-debug", "inherits": "_test_base", - "configurePreset": "xcode-debug" + "configurePreset": "appleclang-debug" }, { - "name": "xcode-release", + "name": "appleclang-release", "inherits": "_test_base", - "configurePreset": "xcode-release" + "configurePreset": "appleclang-release" }, { "name": "msvc-debug", @@ -203,36 +203,36 @@ ] }, { - "name": "xcode-debug", + "name": "appleclang-debug", "steps": [ { "type": "configure", - "name": "xcode-debug" + "name": "appleclang-debug" }, { "type": "build", - "name": "xcode-debug" + "name": "appleclang-debug" }, { "type": "test", - "name": "xcode-debug" + "name": "appleclang-debug" } ] }, { - "name": "xcode-release", + "name": "appleclang-release", "steps": [ { "type": "configure", - "name": "xcode-release" + "name": "appleclang-release" }, { "type": "build", - "name": "xcode-release" + "name": "appleclang-release" }, { "type": "test", - "name": "xcode-release" + "name": "appleclang-release" } ] }, From 81f818bfb9e6ecc7577eedfbe7e2560e59c57655 Mon Sep 17 00:00:00 2001 From: River <26424577+wusatosi@users.noreply.github.com> Date: Wed, 11 Dec 2024 12:21:06 -0500 Subject: [PATCH 12/13] fix capitialization --- .github/workflows/ci_tests.yml | 4 ++-- CMakePresets.json | 36 +++++++++++++++++----------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 8347c54..ac8766f 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -19,9 +19,9 @@ jobs: platform: "ubuntu-latest" - preset: "gcc-release" platform: "ubuntu-latest" - - preset: "appleclang-debug" + - preset: "AppleClang-debug" platform: "macos-latest" - - preset: "appleclang-release" + - preset: "AppleClang-release" platform: "macos-latest" - preset: "msvc-debug" platform: "windows-latest" diff --git a/CMakePresets.json b/CMakePresets.json index 201286f..9f4b91c 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -49,7 +49,7 @@ } }, { - "name": "appleclang-debug", + "name": "AppleClang-debug", "displayName": "xcode Debug Build", "inherits": [ "_root-config", @@ -61,7 +61,7 @@ } }, { - "name": "appleclang-release", + "name": "AppleClang-release", "displayName": "xcode Release Build", "inherits": [ "_root-config", @@ -108,12 +108,12 @@ "configurePreset": "gcc-release" }, { - "name": "appleclang-debug", - "configurePreset": "appleclang-debug" + "name": "AppleClang-debug", + "configurePreset": "AppleClang-debug" }, { - "name": "appleclang-release", - "configurePreset": "appleclang-release" + "name": "AppleClang-release", + "configurePreset": "AppleClang-release" }, { "name": "msvc-debug", @@ -147,14 +147,14 @@ "configurePreset": "gcc-release" }, { - "name": "appleclang-debug", + "name": "AppleClang-debug", "inherits": "_test_base", - "configurePreset": "appleclang-debug" + "configurePreset": "AppleClang-debug" }, { - "name": "appleclang-release", + "name": "AppleClang-release", "inherits": "_test_base", - "configurePreset": "appleclang-release" + "configurePreset": "AppleClang-release" }, { "name": "msvc-debug", @@ -203,36 +203,36 @@ ] }, { - "name": "appleclang-debug", + "name": "AppleClang-debug", "steps": [ { "type": "configure", - "name": "appleclang-debug" + "name": "AppleClang-debug" }, { "type": "build", - "name": "appleclang-debug" + "name": "AppleClang-debug" }, { "type": "test", - "name": "appleclang-debug" + "name": "AppleClang-debug" } ] }, { - "name": "appleclang-release", + "name": "AppleClang-release", "steps": [ { "type": "configure", - "name": "appleclang-release" + "name": "AppleClang-release" }, { "type": "build", - "name": "appleclang-release" + "name": "AppleClang-release" }, { "type": "test", - "name": "appleclang-release" + "name": "AppleClang-release" } ] }, From 416ada44f84346ad73a4964ea1807bc8b053a511 Mon Sep 17 00:00:00 2001 From: River <26424577+wusatosi@users.noreply.github.com> Date: Thu, 12 Dec 2024 17:15:08 -0500 Subject: [PATCH 13/13] Update CMakePresets.json Co-authored-by: David Sankel --- CMakePresets.json | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakePresets.json b/CMakePresets.json index 9f4b91c..a819f57 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -81,7 +81,6 @@ ], "cacheVariables": { "CMAKE_CXX_COMPILER": "cl", - "CMAKE_BUILD_TYPE": "Debug", "CMAKE_CXX_FLAGS": "/EHsc /permissive- /fsanitize=address /Zi" } },