diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-08 08:20:36 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-08 08:20:36 +0100 |
| commit | cae32bd04d117ba2423a8c4db12f8d2d5b809bcb (patch) | |
| tree | 179cc91b4b34b9e7ec587d576e42d89fc13fec43 /qmake/generators/win32/msvc_nmake.cpp | |
| parent | e1a70ce495928e8d81e80b11d7dbd4c4913ee438 (diff) | |
| parent | 04f68053df5c90dca6947c6d2a5bb4e6851e62bb (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8.0
Change-Id: I576187a9905802c177ae483e6c29d0f55cf7034d
Diffstat (limited to 'qmake/generators/win32/msvc_nmake.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index 3a4f6242b2..da10b1984f 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -517,13 +517,12 @@ void NmakeMakefileGenerator::writeBuildRulesPart(QTextStream &t) t << "first: all\n"; t << "all: " << escapeDependencyPath(fileFixify(Option::output.fileName())) - << ' ' << depVar("ALL_DEPS"); + << ' ' << depVar("ALL_DEPS") << " $(DESTDIR_TARGET)\n\n"; + t << "$(DESTDIR_TARGET): " << depVar("PRE_TARGETDEPS") << " $(OBJECTS) " << depVar("POST_TARGETDEPS"); if (templateName == "aux") { t << "\n\n"; return; } - t << " $(DESTDIR_TARGET)\n\n"; - t << "$(DESTDIR_TARGET): " << depVar("PRE_TARGETDEPS") << " $(OBJECTS) " << depVar("POST_TARGETDEPS"); if(!project->isEmpty("QMAKE_PRE_LINK")) t << "\n\t" <<var("QMAKE_PRE_LINK"); |