Changeset 976

Timestamp:

Aug 13, 2011, 10:06:30 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Ensure Makefile generation order in ordered builds.

When one sub-project links to another sub-project's library, ordered
builds are used. However, it's not enough only to build the projects in
the respective order, Makefile generation should be ordered too. One
reason for that is projects using library names with version suffixes
which qmake deduces at Makefile generation time from the .prl file if
the actual library file is not there (not yet built). The .prl file is
generated along with the respective Makefile; hence the dependency.

This applicable to at least Windows and OS/2 and fixes parallel build issues
with some libraries (e.g. QtHelp which depends on QtCLucene).

File:

• trunk/qmake/generators/makefile.cpp (modified) (3 diffs)

trunk/qmake/generators/makefile.cpp

@@ -2467 +2467 @@
     }
 
+
+
     // generate target rules
     for(int target = 0; target < targets.size(); ++target) {
@@ -2513 +2515 @@
             if(out.startsWith(out_directory))
                 out = out.mid(out_directory.length());
-            t << mkfile << ": " << "\n\t";
+            t << mkfile << ": ";
+            if(flags & SubTargetOrdered) {
+                // ensure Makefile generation order as the dependent project may
+                // need a .prl file from the one it depends on in order to
+                // generate a correct library name if version suffixes are used
+                if (!prev_mkfile.isEmpty())
+                    t << prev_mkfile;
+                prev_mkfile = mkfile;
+            }
+            t << "\n\t";
             if(!in_directory.isEmpty()) {
                 t << mkdir_p_asstring(out_directory)
@@ -2523 +2534 @@
             }
             t << subtarget->target << "-qmake_all: ";
+
+
+
+
+
             if(project->isEmpty("QMAKE_NOFORCE"))
                 t <<  " FORCE";