AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make compiler use the project's pdb file

Browse Source 
this avoids the nasty and conflicting vcXX0.pdb files in the build dirs.
VS will already do that.

Change-Id: I7bddaecf3f478edc78cd6654b5a1038db4fe04ff
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2013-11-18 21:39:43 +01:00 committed by The Qt Project
parent a5f6536d9f
commit c419cd1c30
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qmake/generators/win32/msvc_nmake.cpp
View File

@ -391,12 +391,14 @@ void NmakeMakefileGenerator::init()
project->values("QMAKE_CLEAN").append(project->first("DESTDIR") + project->first("TARGET") + version + ".exp"); project->values("QMAKE_CLEAN").append(project->first("DESTDIR") + project->first("TARGET") + version + ".exp");
} }
if (project->isActiveConfig("debug_info")) { if (project->isActiveConfig("debug_info")) {
project->values("QMAKE_DISTCLEAN").append(project->first("DESTDIR") + project->first("TARGET") + version + ".pdb"); QString pdbfile = project->first("DESTDIR") + project->first("TARGET") + version + ".pdb";
project->values("QMAKE_CLEAN").append("vc*.pdb"); project->values("QMAKE_CFLAGS").append("/Fd" + pdbfile);
project->values("QMAKE_CXXFLAGS").append("/Fd" + pdbfile);
project->values("QMAKE_DISTCLEAN").append(pdbfile);
} }
if (project->isActiveConfig("debug")) { if (project->isActiveConfig("debug")) {
project->values("QMAKE_CLEAN").append(project->first("DESTDIR") + project->first("TARGET") + version + ".ilk"); project->values("QMAKE_CLEAN").append(project->first("DESTDIR") + project->first("TARGET") + version + ".ilk");
project->values("QMAKE_CLEAN").append("vc*.idb"); project->values("QMAKE_CLEAN").append(project->first("DESTDIR") + project->first("TARGET") + version + ".idb");
} else { } else {
ProStringList &defines = project->values("DEFINES"); ProStringList &defines = project->values("DEFINES");
if (!defines.contains("NDEBUG")) if (!defines.contains("NDEBUG"))