From 830e1ac1d9044790751370b985c80c9ec3be4b1c Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 1 Jun 2004 14:08:04 -0400 Subject: BUG#895: Adding -DNDEBUG to C and C++ flags for release builds. --- Modules/Platform/HP-UX.cmake | 4 ++-- Modules/Platform/IRIX.cmake | 4 ++-- Modules/Platform/IRIX64.cmake | 4 ++-- Modules/Platform/OSF1.cmake | 8 ++++---- Modules/Platform/Windows-bcc32.cmake | 8 ++++---- Modules/Platform/gcc.cmake | 8 ++++---- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Modules/Platform/HP-UX.cmake b/Modules/Platform/HP-UX.cmake index 38d293b..97d3e24 100644 --- a/Modules/Platform/HP-UX.cmake +++ b/Modules/Platform/HP-UX.cmake @@ -44,8 +44,8 @@ ELSE(CMAKE_COMPILER_IS_GNUCXX) SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,+h") SET (CMAKE_CXX_FLAGS_INIT "") SET (CMAKE_CXX_FLAGS_DEBUG_INIT "-g") - SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "+O3") - SET (CMAKE_CXX_FLAGS_RELEASE_INIT "+O2") + SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "+O3 -DNDEBUG") + SET (CMAKE_CXX_FLAGS_RELEASE_INIT "+O2 -DNDEBUG") SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-g") SET (CMAKE_C_FLAGS_INIT "") diff --git a/Modules/Platform/IRIX.cmake b/Modules/Platform/IRIX.cmake index 7aa659d..9d924c9 100644 --- a/Modules/Platform/IRIX.cmake +++ b/Modules/Platform/IRIX.cmake @@ -8,8 +8,8 @@ IF(NOT CMAKE_COMPILER_IS_GNUCXX) " -ar -o ") SET (CMAKE_CXX_FLAGS_INIT "") SET (CMAKE_CXX_FLAGS_DEBUG_INIT "-g") - SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-O3") - SET (CMAKE_CXX_FLAGS_RELEASE_INIT "-O2") + SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-O3 -DNDEBUG") + SET (CMAKE_CXX_FLAGS_RELEASE_INIT "-O2 -DNDEBUG") SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2") SET (CMAKE_C_FLAGS_INIT "") ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX) diff --git a/Modules/Platform/IRIX64.cmake b/Modules/Platform/IRIX64.cmake index fde50eb..9403381 100644 --- a/Modules/Platform/IRIX64.cmake +++ b/Modules/Platform/IRIX64.cmake @@ -37,8 +37,8 @@ IF(NOT CMAKE_COMPILER_IS_GNUCXX) SET(CMAKE_CXX_CREATE_STATIC_LIBRARY " -ar -o ") SET (CMAKE_CXX_FLAGS_DEBUG_INIT "-g") - SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-O3") - SET (CMAKE_CXX_FLAGS_RELEASE_INIT "-O2") + SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-O3 -DNDEBUG") + SET (CMAKE_CXX_FLAGS_RELEASE_INIT "-O2 -DNDEBUG") SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2") ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX) diff --git a/Modules/Platform/OSF1.cmake b/Modules/Platform/OSF1.cmake index 2ca62b1..f31aac0 100644 --- a/Modules/Platform/OSF1.cmake +++ b/Modules/Platform/OSF1.cmake @@ -34,12 +34,12 @@ ELSE (CMAKE_COMPILER_IS_GNUCXX) # use default OSF compiler flags SET (CMAKE_C_FLAGS_INIT "") SET (CMAKE_C_FLAGS_DEBUG_INIT "-g") - SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "-O2") - SET (CMAKE_C_FLAGS_RELEASE_INIT "-O2") + SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "-O2 -DNDEBUG") + SET (CMAKE_C_FLAGS_RELEASE_INIT "-O2 -DNDEBUG") SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2") SET (CMAKE_CXX_FLAGS_INIT "") SET (CMAKE_CXX_FLAGS_DEBUG_INIT "-g") - SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-O2") - SET (CMAKE_CXX_FLAGS_RELEASE_INIT "-O2") + SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-O2 -DNDEBUG") + SET (CMAKE_CXX_FLAGS_RELEASE_INIT "-O2 -DNDEBUG") SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2") ENDIF(CMAKE_COMPILER_IS_GNUCXX) diff --git a/Modules/Platform/Windows-bcc32.cmake b/Modules/Platform/Windows-bcc32.cmake index c945195..92cbe7b 100644 --- a/Modules/Platform/Windows-bcc32.cmake +++ b/Modules/Platform/Windows-bcc32.cmake @@ -74,13 +74,13 @@ SET(CMAKE_CREATE_CONSOLE_EXE "-tWC" ) SET (CMAKE_CXX_FLAGS_INIT "-w- -whid -waus -wpar -tWM") SET (CMAKE_CXX_FLAGS_DEBUG_INIT "-Od -v") -SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-O1") -SET (CMAKE_CXX_FLAGS_RELEASE_INIT "-O2") +SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-O1 -DNDEBUG") +SET (CMAKE_CXX_FLAGS_RELEASE_INIT "-O2 -DNDEBUG") SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-Od") SET (CMAKE_C_FLAGS_INIT "-w- -whid -waus -tWM") SET (CMAKE_C_FLAGS_DEBUG_INIT "-Od -v") -SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "-O1") -SET (CMAKE_C_FLAGS_RELEASE_INIT "-O2") +SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "-O1 -DNDEBUG") +SET (CMAKE_C_FLAGS_RELEASE_INIT "-O2 -DNDEBUG") SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-Od") SET (CMAKE_EXE_LINKER_FLAGS_INIT "-tWM -lS:10000000 -lSc:10000000 ") diff --git a/Modules/Platform/gcc.cmake b/Modules/Platform/gcc.cmake index 9d289d1..6543f5c 100644 --- a/Modules/Platform/gcc.cmake +++ b/Modules/Platform/gcc.cmake @@ -1,16 +1,16 @@ IF(CMAKE_COMPILER_IS_GNUCC) SET (CMAKE_C_FLAGS_INIT "") SET (CMAKE_C_FLAGS_DEBUG_INIT "-g") - SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "-Os") - SET (CMAKE_C_FLAGS_RELEASE_INIT "-O3") + SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG") + SET (CMAKE_C_FLAGS_RELEASE_INIT "-O3 -DNDEBUG") SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2 -g") ENDIF(CMAKE_COMPILER_IS_GNUCC) IF(CMAKE_COMPILER_IS_GNUCXX) SET (CMAKE_CXX_FLAGS_INIT "") SET (CMAKE_CXX_FLAGS_DEBUG_INIT "-g") - SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-Os") - SET (CMAKE_CXX_FLAGS_RELEASE_INIT "-O3") + SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG") + SET (CMAKE_CXX_FLAGS_RELEASE_INIT "-O3 -DNDEBUG") SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2 -g") ENDIF(CMAKE_COMPILER_IS_GNUCXX) -- cgit v0.12