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

qmake vcxproj generator: map TARGET_EXT to $(TargetExt)

Browse Source 
Task-number: QTBUG-26782

Change-Id: Ib143fa6b8674c4d09d798a9301bb209b886e791d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Joerg Bornemann 2012-08-07 17:16:56 +02:00 committed by Qt by Nokia
parent b4ae57c881
commit e81d7fd1e5
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qmake/generators/win32/msbuild_objectmodel.cpp
View File

@ -455,7 +455,11 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProjectSingleConfig &tool)
<< attrTag("Condition", condition) << attrTag("Condition", condition)
<< valueTag(tool.Configuration.PrimaryOutput); << valueTag(tool.Configuration.PrimaryOutput);
} }
if (!tool.Configuration.PrimaryOutputExtension.isEmpty()) {
xml<< tag("TargetExt")
<< attrTag("Condition", condition)
<< valueTag(tool.Configuration.PrimaryOutputExtension);
}
if ( tool.Configuration.linker.IgnoreImportLibrary != unset) { if ( tool.Configuration.linker.IgnoreImportLibrary != unset) {
xml<< tag("IgnoreImportLibrary") xml<< tag("IgnoreImportLibrary")
<< attrTag("Condition", condition) << attrTag("Condition", condition)
@ -652,7 +656,11 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool)
<< attrTag("Condition", condition) << attrTag("Condition", condition)
<< valueTag(config.PrimaryOutput); << valueTag(config.PrimaryOutput);
} }
if (!config.PrimaryOutputExtension.isEmpty()) {
xml << tag("TargetExt")
<< attrTag("Condition", condition)
<< valueTag(config.PrimaryOutputExtension);
}
if (config.linker.IgnoreImportLibrary != unset) { if (config.linker.IgnoreImportLibrary != unset) {
xml << tag("IgnoreImportLibrary") xml << tag("IgnoreImportLibrary")
<< attrTag("Condition", condition) << attrTag("Condition", condition)

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

@ -856,6 +856,7 @@ public:
QString ConfigurationName; QString ConfigurationName;
QString OutputDirectory; QString OutputDirectory;
QString PrimaryOutput; QString PrimaryOutput;
QString PrimaryOutputExtension;
QString ProgramDatabase; QString ProgramDatabase;
triState RegisterOutput; triState RegisterOutput;
useOfATL UseOfATL; useOfATL UseOfATL;

1
qmake/generators/win32/msvc_vcproj.cpp
View File

@ -908,6 +908,7 @@ void VcprojGenerator::initConfiguration()
conf.PrimaryOutput = project->first("TARGET"); conf.PrimaryOutput = project->first("TARGET");
if ( !conf.PrimaryOutput.isEmpty() && !project->first("TARGET_VERSION_EXT").isEmpty() && project->isActiveConfig("shared")) if ( !conf.PrimaryOutput.isEmpty() && !project->first("TARGET_VERSION_EXT").isEmpty() && project->isActiveConfig("shared"))
conf.PrimaryOutput.append(project->first("TARGET_VERSION_EXT")); conf.PrimaryOutput.append(project->first("TARGET_VERSION_EXT"));
conf.PrimaryOutputExtension = project->first("TARGET_EXT");
} }
conf.Name = project->values("BUILD_NAME").join(" "); conf.Name = project->values("BUILD_NAME").join(" ");