summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2013-03-01 10:54:45 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-01 13:05:11 +0100
commitebc4fb452ac268657023cb957c1b0ca0e315b9fc (patch)
tree9acd77f378ba37730186303d0fca4a6ed86b4265 /qmake
parent8238acccf028e4beaa8dadf19b768920cc1d45bb (diff)
define NDEBUG in MSVC/nmake release builds
Some headers, like assert.h, check for the presence of NDEBUG. We already define NDEBUG for MSVC/vcproj release builds. Task-number: QTBUG-3389 Change-Id: I3b1510d47ff80611aa8072e66492ff2d648393eb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/win32/msvc_nmake.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 8b40d4e935..01243defd3 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -304,6 +304,11 @@ void NmakeMakefileGenerator::init()
project->values("QMAKE_CLEAN").append(project->first("DESTDIR") + project->first("TARGET") + version + ".ilk");
project->values("QMAKE_CLEAN").append("vc*.pdb");
project->values("QMAKE_CLEAN").append("vc*.idb");
+ project->values("DEFINES").removeAll("NDEBUG");
+ } else {
+ ProStringList &defines = project->values("DEFINES");
+ if (!defines.contains("NDEBUG"))
+ defines.append("NDEBUG");
}
}