commit a86b6555d7d774c392734a37c70e59cc4cd1ca6b
author Mate Toth-Pal <mate.toth-pal@arm.com> Tue Jun 18 21:20:40 2019 +0200
committer Máté Tóth-Pál <Mate.Toth-Pal@arm.com> Wed Jun 26 12:40:25 2019 +0000
tree 0cb2207629501259e305b1a2eb39fe2845a54631
parent c640e07d4c86fe6107a25ba2c6bb1b115a029b97

Build: define NDEBUG for Relwithdebinfo builds

The NDEBUG macro have to be defined for Relwithdebinfo to be consistent
with Release and Minsizerel builds.

Change-Id: I0c24be33184cf204c414e18eff8c05f70bfcf723
Signed-off-by: Mate Toth-Pal <mate.toth-pal@arm.com>

cmake/Compiler/ARMClang.cmake

diff --git a/cmake/Compiler/ARMClang.cmake b/cmake/Compiler/ARMClang.cmake
index adba158..a5ed2f3 100644
--- a/cmake/Compiler/ARMClang.cmake
+++ b/cmake/Compiler/ARMClang.cmake
@@ -31,7 +31,7 @@
     string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -O0")
     string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Oz -DNDEBUG")
     string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3 -DNDEBUG")
-    string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O3 -g")
+    string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O3 -g -DNDEBUG")
 
     set(CMAKE_${lang}_OUTPUT_EXTENSION ".o")
     set(CMAKE_${lang}_OUTPUT_EXTENSION_REPLACE 1)

cmake/Compiler/GNUARM.cmake

diff --git a/cmake/Compiler/GNUARM.cmake b/cmake/Compiler/GNUARM.cmake
index e0aec56..17d416c 100644
--- a/cmake/Compiler/GNUARM.cmake
+++ b/cmake/Compiler/GNUARM.cmake
@@ -31,7 +31,7 @@
     string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -O0")
     string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG")
     string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3 -DNDEBUG")
-    string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O3 -g")
+    string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O3 -g -DNDEBUG")
 
     set(CMAKE_${lang}_OUTPUT_EXTENSION ".o")
     set(CMAKE_${lang}_OUTPUT_EXTENSION_REPLACE 1)