diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-03-01 09:54:45 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-01 20:40:04 (GMT) |
| commit | 942e1ea5de0fe7fa1afd5ac4fb484be0d157cf95 (patch) | |
| tree | 54d30aa807782b31df7ae1c40d1d271690d1905e /qmake/generators | |
| parent | 978e523a296db97c08d7cd9fc81c491a99e830da (diff) | |
| download | Qt-942e1ea5de0fe7fa1afd5ac4fb484be0d157cf95.zip Qt-942e1ea5de0fe7fa1afd5ac4fb484be0d157cf95.tar.gz Qt-942e1ea5de0fe7fa1afd5ac4fb484be0d157cf95.tar.bz2 | |
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>
(cherry picked from commit ebc4fb452ac268657023cb957c1b0ca0e315b9fc)
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index d2ffe94..b448783 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -270,6 +270,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 { + QStringList &defines = project->values("DEFINES"); + if (!defines.contains("NDEBUG")) + defines.append("NDEBUG"); } } |