Merge branch 'next' into squelch_reports
This commit is contained in:
commit
b967065c36
|
@ -139,11 +139,9 @@ endif ()
|
||||||
# Diagnostics
|
# Diagnostics
|
||||||
# Enable building with logs, some memory diagnostics.
|
# Enable building with logs, some memory diagnostics.
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
if (MSVC AND NOT CMAKE_BUILD_TYPE MATCHES Release)
|
|
||||||
option( ENABLE_DEBUG_LOG "Set ON to output debugging messages." ON )
|
option( ENABLE_DEBUG_LOG "Set ON to output debugging messages." ON )
|
||||||
else ()
|
option( ENABLE_ALLOC_DEBUG "Set ON to output node allocation diagnostics." OFF )
|
||||||
option( ENABLE_DEBUG_LOG "Set ON to output debugging messages." OFF )
|
option( ENABLE_MEMORY_DEBUG "Set ON to output some memory diagnostics." OFF )
|
||||||
endif ()
|
|
||||||
|
|
||||||
if ( ENABLE_DEBUG_LOG )
|
if ( ENABLE_DEBUG_LOG )
|
||||||
add_definitions( -DENABLE_DEBUG_LOG )
|
add_definitions( -DENABLE_DEBUG_LOG )
|
||||||
|
@ -152,9 +150,6 @@ else ()
|
||||||
message(STATUS "*** Debug Logging is NOT enabled.")
|
message(STATUS "*** Debug Logging is NOT enabled.")
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
option( ENABLE_ALLOC_DEBUG "Set ON to output node allocation diagnostics." OFF )
|
|
||||||
option( ENABLE_MEMORY_DEBUG "Set ON to output some memory diagnostics." OFF )
|
|
||||||
|
|
||||||
if (ENABLE_ALLOC_DEBUG)
|
if (ENABLE_ALLOC_DEBUG)
|
||||||
add_definitions ( -DDEBUG_ALLOCATION ) # see lexer.c for details
|
add_definitions ( -DDEBUG_ALLOCATION ) # see lexer.c for details
|
||||||
message(STATUS "*** Note, lexer.c node allocation diagnostics are ON")
|
message(STATUS "*** Note, lexer.c node allocation diagnostics are ON")
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
5.5.61
|
5.5.62
|
||||||
2017.10.07
|
2017.10.08
|
||||||
|
|
Loading…
Reference in a new issue