Commit 9aa6c4a1 authored by Yuchen Deng's avatar Yuchen Deng
Browse files

CMake: Does not need m_buildTargetType anymore



Change-Id: I45f927391d73258f8f61eebe8543b6f5052678ec
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent 45656335
......@@ -1093,7 +1093,6 @@ void CMakeCbpParser::parseBuild()
void CMakeCbpParser::parseBuildTarget()
{
m_buildTargetType = false;
m_buildTarget.clear();
if (attributes().hasAttribute(QLatin1String("title")))
......@@ -1119,15 +1118,10 @@ void CMakeCbpParser::parseBuildTargetOption()
{
if (attributes().hasAttribute(QLatin1String("output"))) {
m_buildTarget.executable = attributes().value(QLatin1String("output")).toString();
} else if (attributes().hasAttribute(QLatin1String("type"))
&& (attributes().value(QLatin1String("type")) == QLatin1String("1")
|| attributes().value(QLatin1String("type")) == QLatin1String("0"))) {
m_buildTargetType = 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("type"))) {
const QString value = attributes().value(QLatin1String("type")).toString();
if (value == QLatin1String("2") || value == QLatin1String("3"))
m_buildTarget.library = true;
} else if (attributes().hasAttribute(QLatin1String("working_dir"))) {
m_buildTarget.workingDirectory = attributes().value(QLatin1String("working_dir")).toString();
}
......
......@@ -190,7 +190,6 @@ private:
QStringList m_compilerOptions;
CMakeBuildTarget m_buildTarget;
bool m_buildTargetType;
QList<CMakeBuildTarget> m_buildTargets;
QString m_projectName;
QString m_compiler;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment