Changeset 529 for trunk/qmake/generators

Timestamp:

Feb 5, 2010, 12:42:15 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Obey TARGET_SHORT when generating install commands for DLLs (which involve the import library which name is affected by TARGET_SHORT).

Location:

trunk/qmake/generators

Files:

• os2/gnumake.cpp (modified) (1 diff)
• os2/gnumake.h (modified) (1 diff)
• win32/winmakefile.cpp (modified) (2 diffs)

trunk/qmake/generators/os2/gnumake.cpp

@@ -636 +636 @@
 }
 
+QString GNUMakefileGenerator::getLibTarget()
+{
+    if (mode == DLL && !project->isEmpty("QMAKE_RUN_IMPLIB"))
+        return QString("$(notdir $(TARGET_IMPLIB))");
+    return Win32MakefileGenerator::getLibTarget();
+}
+
 QStringList &GNUMakefileGenerator::findDependencies(const QString &file)
 {

trunk/qmake/generators/os2/gnumake.h

@@ -72 +72 @@
     void processPrlVariable(const QString &var, const QStringList &l);
     void processPrlFiles();
+    QString getLibTarget();
 
     QStringList &findDependencies(const QString &file);

trunk/qmake/generators/win32/winmakefile.cpp

@@ -456 +456 @@
         resFile.replace(".rc", Option::res_ext);
         project->values("RES_FILE").prepend(fileInfo(resFile).fileName());
-        if (!project->values("OBJECTS_DIR").isEmpty())
+        if (!project->values("OBJECTS_DIR").isEmpty()) {
             if(project->isActiveConfig("staticlib"))
                 project->values("RES_FILE").first().prepend(fileInfo(project->values("DESTDIR").first()).absoluteFilePath() + Option::dir_sep);
             else
               project->values("RES_FILE").first().prepend(project->values("OBJECTS_DIR").first() + Option::dir_sep);
+        }
         project->values("RES_FILE").first() = Option::fixPathToTargetOS(project->values("RES_FILE").first(), false, false);
         project->values("POST_TARGETDEPS") += project->values("RES_FILE");
@@ -768 +769 @@
 QString Win32MakefileGenerator::getLibTarget()
 {
-    return QString(project->first("TARGET") + project->first("TARGET_VERSION_EXT") + ".lib");
+    QString target = project->first("TARGET_SHORT");
+    if (target.isEmpty())
+        target = project->first("TARGET");
+    return QString(target + project->first("TARGET_VERSION_EXT") + ".lib");
 }