From f56179a50f34a20978e8e30daccce8facc62f50b Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 20 Nov 2023 14:42:00 +0100 Subject: [PATCH] Enable GLIBCXX_DEBUG in maintainer mode --- tools/cmake/MaintainerMode.cmake | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tools/cmake/MaintainerMode.cmake b/tools/cmake/MaintainerMode.cmake index 9a4f3b5cda..42b4789db8 100644 --- a/tools/cmake/MaintainerMode.cmake +++ b/tools/cmake/MaintainerMode.cmake @@ -11,6 +11,13 @@ set(FLEX_MIN_PATCH 39) # Let's generate header files required by SMPI when the call location tracing # has been activated. if(enable_maintainer_mode) + if (enable_ns3) + message(STATUS "Maintainer mode activated with ns-3, not enabling GLIBCXX_DEBUG (diable ns-3 to get it).") + else() + message(STATUS "Maintainer mode activated, enabling GLIBCXX_DEBUG.") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_DEBUG") + endif() + add_custom_command(OUTPUT ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_extended_traces.h ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_extended_traces_fortran.h DEPENDS @@ -173,9 +180,9 @@ if(enable_maintainer_mode) endif() - add_custom_target(maintainer_files - DEPENDS ${CMAKE_HOME_DIRECTORY}/src/kernel/xml/simgrid_dtd.h - ${CMAKE_HOME_DIRECTORY}/src/kernel/xml/simgrid_dtd.c - ${CMAKE_HOME_DIRECTORY}/src/dag/dax_dtd.h - ${CMAKE_HOME_DIRECTORY}/src/dag/dax_dtd.c - ) +add_custom_target(maintainer_files + DEPENDS ${CMAKE_HOME_DIRECTORY}/src/kernel/xml/simgrid_dtd.h + ${CMAKE_HOME_DIRECTORY}/src/kernel/xml/simgrid_dtd.c + ${CMAKE_HOME_DIRECTORY}/src/dag/dax_dtd.h + ${CMAKE_HOME_DIRECTORY}/src/dag/dax_dtd.c + ) -- 2.20.1