From 2c056cd56aa459c78f81747721451010c7706ae1 Mon Sep 17 00:00:00 2001 From: Agustin Berge Date: Mon, 1 Sep 2025 12:53:15 +0200 Subject: [PATCH] replace debwithopt with optimizeddebug --- docs/modules/ROOT/pages/install.adoc | 2 +- third-party/llvm/CMakePresets.json | 16 ++++++++-------- third-party/llvm/CMakeUserPresets.json | 16 ++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/modules/ROOT/pages/install.adoc b/docs/modules/ROOT/pages/install.adoc index 5f82a08e30..563aeea655 100644 --- a/docs/modules/ROOT/pages/install.adoc +++ b/docs/modules/ROOT/pages/install.adoc @@ -325,7 +325,7 @@ Choose one of the presets from `CMakePresets.json` or edit the variants in `CMak [NOTE] ==== Developers might also want to build a custom `Debug` LLVM configuration including optimizations, which allows for faster execution of tests. -The `relwithdebinfo` and `debwithopt` presets are provided for this purpose. +The `relwithdebinfo` and `optimizeddebug` presets are provided for this purpose. Or if you prefer using the command line, set `CMAKE_CONFIGURATION_TYPES` or `CMAKE_BUILD_TYPE` to `Debug` and manually include the optimization flags to `-D CMAKE_CXX_FLAGS="/O2 /Zi"` (MSVC) or `-D CMAKE_CXX_FLAGS="-Og -g"`. This should give you an optimized build with all debug features and flags, such as an appropriate https://learn.microsoft.com/en-us/cpp/standard-library/iterator-debug-level[`_ITERATOR_DEBUG_LEVEL`] and the `/MDd` flag in MSVC. diff --git a/third-party/llvm/CMakePresets.json b/third-party/llvm/CMakePresets.json index 853d1bfc9b..20725066e8 100644 --- a/third-party/llvm/CMakePresets.json +++ b/third-party/llvm/CMakePresets.json @@ -57,9 +57,9 @@ } }, { - "name": "debwithopt", + "name": "optimizeddebug", "inherits": "debug", - "displayName": "DebWithOpt-Base", + "displayName": "OptimizedDebug-Base", "description": "Debug Config with Release Optimization", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug" @@ -104,12 +104,12 @@ } }, { - "name": "debwithopt-win", + "name": "optimizeddebug-win", "inherits": [ "debug-win", - "debwithopt" + "optimizeddebug" ], - "displayName": "DebWithOptde-Base-Win", + "displayName": "OptimizedDebug-Base-Win", "description": "Debug Config with Release Optimization", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", @@ -151,12 +151,12 @@ } }, { - "name": "debwithopt-unix", + "name": "optimizeddebug-unix", "inherits": [ "debug-unix", - "debwithopt" + "optimizeddebug" ], - "displayName": "DebWithOpt-Base-Unix", + "displayName": "OptimizedDebug-Base-Unix", "description": "Debug Config with Release Optimization", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", diff --git a/third-party/llvm/CMakeUserPresets.json b/third-party/llvm/CMakeUserPresets.json index 63aade5604..b8697b0ccb 100644 --- a/third-party/llvm/CMakeUserPresets.json +++ b/third-party/llvm/CMakeUserPresets.json @@ -10,11 +10,11 @@ } }, { - "name": "debwithopt-msvc", - "inherits": "debwithopt-win", - "binaryDir": "${sourceDir}/build/MSVC/DebWithOpt", + "name": "optimizeddebug-msvc", + "inherits": "optimizeddebug-win", + "binaryDir": "${sourceDir}/build/MSVC/OptimizedDebug", "cacheVariables": { - "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/MSVC/DebWithOpt" + "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/MSVC/OptimizedDebug" }, "architecture": { "value": "x64", @@ -67,14 +67,14 @@ } }, { - "name": "debwithopt-linux", + "name": "optimizeddebug-linux", "inherits": [ - "debwithopt-unix", + "optimizeddebug-unix", "debug-linux" ], - "binaryDir": "${sourceDir}/build/Linux/DebWithOpt", + "binaryDir": "${sourceDir}/build/Linux/OptimizedDebug", "cacheVariables": { - "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/Linux/DebWithOpt" + "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/Linux/OptimizedDebug" } }, {