From b47eb3128da738388350d3c3a6efb43d8cc7f5f3 Mon Sep 17 00:00:00 2001 From: Rangi <35663410+Rangi42@users.noreply.github.com> Date: Fri, 20 Nov 2026 23:58:12 -0500 Subject: [PATCH] Use CMake's `add_compile_definitions` instead of `add_definitions` (#2249) The latter "has been superseded", and the former handles the platform-specific `-D` or `/D` syntax. --- CMakeLists.txt | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 72781765..eb692751 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,20 +58,22 @@ if(SANITIZERS) if(MSVC) message(STATUS "ASan enabled") add_compile_options(/fsanitize=address /sdl) # Note that this shouldn't be passed to the linker. - add_definitions(/_MSVC_STL_HARDENING=1 /_MSVC_STL_DESTRUCTOR_TOMBSTONES=1 /D_ITERATOR_DEBUG_LEVEL=2) + add_compile_definitions(_MSVC_STL_HARDENING=1 _MSVC_STL_DESTRUCTOR_TOMBSTONES=1 _ITERATOR_DEBUG_LEVEL=2) else() # We assume a GNU-like compiler. message(STATUS "ASan and UBSan enabled") set(SAN_FLAGS -fsanitize=address,undefined,float-divide-by-zero,float-cast-overflow,pointer-compare,pointer-subtract) add_compile_options(${SAN_FLAGS}) add_link_options(${SAN_FLAGS}) # Consider using `_GLIBCXX_DEBUG_BACKTRACE` (and `-lstdc++exp`) if unable to debug locally. - add_definitions(-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -D_GLIBCXX_SANITIZE_VECTOR - -D_GLIBCXX_VERBOSE_ASSERT - # This enables debug-mode checks for `std::string`s, but stdlibc++ says - # "this is unsupported and not guaranteed to work", so removing it may be fine. - # https://gcc.gnu.org/onlinedocs/libstdc++/manual/debug_mode_semantics.html - -D_GLIBCXX_EXTERN_TEMPLATE=0 - -D_LIBCPP_DEBUG -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG) + add_compile_definitions( + _GLIBCXX_DEBUG _GLIBCXX_DEBUG_PEDANTIC _GLIBCXX_SANITIZE_VECTOR + _GLIBCXX_VERBOSE_ASSERT + # This enables debug-mode checks for `std::string`s, but stdlibc++ says + # "this is unsupported and not guaranteed to work", so removing it may be fine. + # https://gcc.gnu.org/onlinedocs/libstdc++/manual/debug_mode_semantics.html + _GLIBCXX_EXTERN_TEMPLATE=0 + _LIBCPP_DEBUG _LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG + ) # A non-zero optimization level is desired even in debug mode (especially for Clang), # and the two codegen flags improve the sanitizers' backtraces, but we want the user to # be able to override these easily so we put them first.