1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MSVC: Support precompiled header also for C files

Browse Source 
It was already done correctly in the GCC generators, but lacked in MSVC.

Task-number: QTBUG-11117
Change-Id: I5e6c2e4802dbe33c0f15c46a227a08c3f0cc5707
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Orgad Shaneh 2017-08-22 23:26:46 +03:00 committed by Orgad Shaneh
parent f480a25d1a
commit 30331afda1
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -302,6 +302,13 @@ QStringList &NmakeMakefileGenerator::findDependencies(const QString &file)
break; break;
} }
} }
for (QStringList::Iterator it = Option::c_ext.begin(); it != Option::c_ext.end(); ++it) {
if (file.endsWith(*it)) {
if (!precompObjC.isEmpty() && !aList.contains(precompObjC))
aList += precompObjC;
break;
}
}
return aList; return aList;
} }
@ -317,19 +324,29 @@ void NmakeMakefileGenerator::writeNmakeParts(QTextStream &t)
<< escapeDependencyPaths(findDependencies(precompH)).join(" \\\n\t\t") << escapeDependencyPaths(findDependencies(precompH)).join(" \\\n\t\t")
<< "\n\t$(CXX) " + precompRule +" $(CXXFLAGS) $(INCPATH) -TP " << "\n\t$(CXX) " + precompRule +" $(CXXFLAGS) $(INCPATH) -TP "
<< escapeFilePath(precompH) << endl << endl; << escapeFilePath(precompH) << endl << endl;
QString precompRuleC = QString("-c -Yc -Fp%1 -Fo%2")
.arg(escapeFilePath(precompPchC), escapeFilePath(precompObjC));
t << escapeDependencyPath(precompObjC) << ": " << escapeDependencyPath(precompH) << ' '
<< escapeDependencyPaths(findDependencies(precompH)).join(" \\\n\t\t")
<< "\n\t$(CC) " + precompRuleC +" $(CFLAGS) $(INCPATH) -TC "
<< escapeFilePath(precompH) << endl << endl;
} }
} }
QString NmakeMakefileGenerator::var(const ProKey &value) const QString NmakeMakefileGenerator::var(const ProKey &value) const
{ {
if (usePCH) { if (usePCH) {
if ((value == "QMAKE_RUN_CXX_IMP_BATCH" const bool isRunC = (value == "QMAKE_RUN_CC_IMP_BATCH"
|| value == "QMAKE_RUN_CC_IMP"
|| value == "QMAKE_RUN_CC");
if (isRunC
|| value == "QMAKE_RUN_CXX_IMP_BATCH"
|| value == "QMAKE_RUN_CXX_IMP" || value == "QMAKE_RUN_CXX_IMP"
|| value == "QMAKE_RUN_CXX")) { || value == "QMAKE_RUN_CXX") {
QFileInfo precompHInfo(fileInfo(precompH)); QFileInfo precompHInfo(fileInfo(precompH));
QString precompH_f = escapeFilePath(precompHInfo.fileName()); QString precompH_f = escapeFilePath(precompHInfo.fileName());
QString precompRule = QString("-c -FI%1 -Yu%2 -Fp%3") QString precompRule = QString("-c -FI%1 -Yu%2 -Fp%3")
.arg(precompH_f, precompH_f, escapeFilePath(precompPch)); .arg(precompH_f, precompH_f, escapeFilePath(isRunC ? precompPchC : precompPch));
QString p = MakefileGenerator::var(value); QString p = MakefileGenerator::var(value);
p.replace(QLatin1String("-c"), precompRule); p.replace(QLatin1String("-c"), precompRule);
// Cannot use -Gm with -FI & -Yu, as this gives an // Cannot use -Gm with -FI & -Yu, as this gives an
@ -397,13 +414,19 @@ void NmakeMakefileGenerator::init()
// Created files // Created files
precompObj = var("PRECOMPILED_DIR") + project->first("TARGET") + "_pch" + Option::obj_ext; precompObj = var("PRECOMPILED_DIR") + project->first("TARGET") + "_pch" + Option::obj_ext;
precompPch = var("PRECOMPILED_DIR") + project->first("TARGET") + "_pch.pch"; precompPch = var("PRECOMPILED_DIR") + project->first("TARGET") + "_pch.pch";
precompObjC = var("PRECOMPILED_DIR") + project->first("TARGET") + "_pch_c" + Option::obj_ext;
precompPchC = var("PRECOMPILED_DIR") + project->first("TARGET") + "_pch_c.pch";
// Add linking of precompObj (required for whole precompiled classes) // Add linking of precompObj (required for whole precompiled classes)
project->values("OBJECTS") += precompObj; project->values("OBJECTS") += precompObj;
project->values("OBJECTS") += precompObjC;
// Add pch file to cleanup // Add pch file to cleanup
project->values("QMAKE_CLEAN") += precompPch; project->values("QMAKE_CLEAN") += precompPch;
project->values("QMAKE_CLEAN") += precompPchC;
// Return to variable pool // Return to variable pool
project->values("PRECOMPILED_OBJECT") = ProStringList(precompObj); project->values("PRECOMPILED_OBJECT") = ProStringList(precompObj);
project->values("PRECOMPILED_PCH") = ProStringList(precompPch); project->values("PRECOMPILED_PCH") = ProStringList(precompPch);
project->values("PRECOMPILED_OBJECT_C") = ProStringList(precompObjC);
project->values("PRECOMPILED_PCH_C") = ProStringList(precompPchC);
} }
ProString tgt = project->first("DESTDIR") ProString tgt = project->first("DESTDIR")

1
qmake/generators/win32/msvc_nmake.h
View File

@ -52,6 +52,7 @@ protected:
virtual QStringList &findDependencies(const QString &file); virtual QStringList &findDependencies(const QString &file);
QString var(const ProKey &value) const; QString var(const ProKey &value) const;
QString precompH, precompObj, precompPch; QString precompH, precompObj, precompPch;
QString precompObjC, precompPchC;
bool usePCH; bool usePCH;
public: public: