From 68cbdf4bf4efdea49b6f76b6e122b26c5e32b64f Mon Sep 17 00:00:00 2001 From: Daniil Smirnov <85727246+smirnov-daniil@users.noreply.github.com> Date: Fri, 29 Nov 2024 01:04:14 +0300 Subject: [PATCH 1/3] Update CMakePresets.json binaryDir path. Probably should add ``` "cacheVariables": { "CMAKE_TOOLCHAIN_FILE": "/my/path/to/vcpkg.cmake" } ``` to "default" preset. --- CMakePresets.json | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 03c888c..5247b06 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -6,56 +6,61 @@ "patch": 0 }, "configurePresets": [ + { + "name": "default", + "hidden": true, + "binaryDir": "${sourceDir}/build/cmake-build-${presetName}" + }, { "name": "Release", + "inherits": "default", "description": "Default Release build", "cacheVariables": { "CMAKE_BUILD_TYPE": "Release" - }, - "binaryDir": "cmake-build-${presetName}" + } }, { "name": "Debug", + "inherits": "default", "description": "Debug build without sanitizers", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug" - }, - "binaryDir": "cmake-build-${presetName}" + } }, { "name": "RelWithDebInfo", + "inherits": "default", "description": "Release with debug info", "cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo" - }, - "binaryDir": "cmake-build-${presetName}" + } }, { "name": "Sanitized", + "inherits": "default", "description": "RelWithDebInfo build with undefined and address sanitizers enabled", "cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo", "USE_SANITIZERS": "ON" - }, - "binaryDir": "cmake-build-${presetName}" + } }, { "name": "SanitizedDebug", + "inherits": "default", "description": "Debug build with undefined and address sanitizers enabled", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "USE_SANITIZERS": "ON" - }, - "binaryDir": "cmake-build-${presetName}" + } }, { "name": "ThreadSanitized", + "inherits": "default", "description": "RelWithDebInfo build with thread sanitizer enabled", "cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo", "USE_THREAD_SANITIZER": "ON" - }, - "binaryDir": "cmake-build-${presetName}" + } } ] } From 80c115d090f2c9c2423341d673e86f318385dd50 Mon Sep 17 00:00:00 2001 From: Artem Koton Date: Sat, 30 Nov 2024 02:41:23 +0300 Subject: [PATCH 2/3] Update CMakePresets.json --- CMakePresets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakePresets.json b/CMakePresets.json index 5247b06..b0d1d9e 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -9,7 +9,7 @@ { "name": "default", "hidden": true, - "binaryDir": "${sourceDir}/build/cmake-build-${presetName}" + "binaryDir": "${sourceDir}/cmake-build-${presetName}" }, { "name": "Release", From b4f74b260f0f93f137d48ae9c74cc2388d8631ae Mon Sep 17 00:00:00 2001 From: Daniil Smirnov <85727246+smirnov-daniil@users.noreply.github.com> Date: Sun, 8 Dec 2024 21:05:03 +0300 Subject: [PATCH 3/3] Add ".vs" to .gitignore file. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 94637f6..3991685 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ *.user .idea *.cbp +.vs # Cmake CMakeCache.txt