mirror of
https://github.com/microsoft/mimalloc.git
synced 2025-05-03 22:19:32 +03:00
do not default to MI_DEBUG=2 in release mode builds even when NDEBUG is not defined by defininig MI_BUILD_RELEASE (issue #1037)
This commit is contained in:
parent
7eafaa9685
commit
660d749d77
2 changed files with 6 additions and 4 deletions
|
@ -532,7 +532,9 @@ if(MI_TRACK_ASAN)
|
||||||
endif()
|
endif()
|
||||||
string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LC)
|
string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LC)
|
||||||
list(APPEND mi_defines "MI_CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE_LC}") #todo: multi-config project needs $<CONFIG> ?
|
list(APPEND mi_defines "MI_CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE_LC}") #todo: multi-config project needs $<CONFIG> ?
|
||||||
if(NOT(CMAKE_BUILD_TYPE_LC MATCHES "^(release|relwithdebinfo|minsizerel|none)$"))
|
if(CMAKE_BUILD_TYPE_LC MATCHES "^(release|relwithdebinfo|minsizerel|none)$")
|
||||||
|
list(APPEND mi_defines MI_BUILD_RELEASE)
|
||||||
|
else()
|
||||||
set(mi_libname "${mi_libname}-${CMAKE_BUILD_TYPE_LC}") #append build type (e.g. -debug) if not a release version
|
set(mi_libname "${mi_libname}-${CMAKE_BUILD_TYPE_LC}") #append build type (e.g. -debug) if not a release version
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
|
@ -66,10 +66,10 @@ terms of the MIT license. A copy of the license can be found in the file
|
||||||
// #define MI_DEBUG 2 // + internal assertion checks
|
// #define MI_DEBUG 2 // + internal assertion checks
|
||||||
// #define MI_DEBUG 3 // + extensive internal invariant checking (cmake -DMI_DEBUG_FULL=ON)
|
// #define MI_DEBUG 3 // + extensive internal invariant checking (cmake -DMI_DEBUG_FULL=ON)
|
||||||
#if !defined(MI_DEBUG)
|
#if !defined(MI_DEBUG)
|
||||||
#if !defined(NDEBUG) || defined(_DEBUG)
|
#if defined(MI_BUILD_RELEASE) || defined(NDEBUG)
|
||||||
#define MI_DEBUG 2
|
|
||||||
#else
|
|
||||||
#define MI_DEBUG 0
|
#define MI_DEBUG 0
|
||||||
|
#else
|
||||||
|
#define MI_DEBUG 2
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue