feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Does not need m_buildTargetType anymore

Browse Source 
Change-Id: I45f927391d73258f8f61eebe8543b6f5052678ec
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Yuchen Deng
2013-02-17 10:58:43 +08:00
parent 45656335fc
commit 9aa6c4a164
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -1093,7 +1093,6 @@ void CMakeCbpParser::parseBuild()
void CMakeCbpParser::parseBuildTarget() void CMakeCbpParser::parseBuildTarget()
{ {
m_buildTargetType = false;
m_buildTarget.clear(); m_buildTarget.clear();
if (attributes().hasAttribute(QLatin1String("title"))) if (attributes().hasAttribute(QLatin1String("title")))
@@ -1119,15 +1118,10 @@ void CMakeCbpParser::parseBuildTargetOption()
{ {
if (attributes().hasAttribute(QLatin1String("output"))) { if (attributes().hasAttribute(QLatin1String("output"))) {
m_buildTarget.executable = attributes().value(QLatin1String("output")).toString(); m_buildTarget.executable = attributes().value(QLatin1String("output")).toString();
} else if (attributes().hasAttribute(QLatin1String("type")) } else if (attributes().hasAttribute(QLatin1String("type"))) {
&& (attributes().value(QLatin1String("type")) == QLatin1String("1") const QString value = attributes().value(QLatin1String("type")).toString();
|| attributes().value(QLatin1String("type")) == QLatin1String("0"))) { if (value == QLatin1String("2") || value == QLatin1String("3"))
m_buildTargetType = true; m_buildTarget.library = true;
} else if (attributes().hasAttribute(QLatin1String("type"))
&& (attributes().value(QLatin1String("type")) == QLatin1String("3")
|| attributes().value(QLatin1String("type")) == QLatin1String("2"))) {
m_buildTargetType = true;
m_buildTarget.library = true;
} else if (attributes().hasAttribute(QLatin1String("working_dir"))) { } else if (attributes().hasAttribute(QLatin1String("working_dir"))) {
m_buildTarget.workingDirectory = attributes().value(QLatin1String("working_dir")).toString(); m_buildTarget.workingDirectory = attributes().value(QLatin1String("working_dir")).toString();
} }

1
src/plugins/cmakeprojectmanager/cmakeproject.h
View File

@@ -190,7 +190,6 @@ private:
QStringList m_compilerOptions; QStringList m_compilerOptions;
CMakeBuildTarget m_buildTarget; CMakeBuildTarget m_buildTarget;
bool m_buildTargetType;
QList<CMakeBuildTarget> m_buildTargets; QList<CMakeBuildTarget> m_buildTargets;
QString m_projectName; QString m_projectName;
QString m_compiler; QString m_compiler;