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

CMake: Do not map all unknown build target types to "ExecutableType"

Browse Source 
There is UtilityType now, so use that if there is no executable being
generated.

Change-Id: I9e8d512077b8352ec056b49c8db03644482b8fbc
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Tobias Hunger
2016-08-17 11:13:39 +02:00
parent 72991fe9f8
commit bda9bf6755
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/cmakeprojectmanager/cmakecbpparser.cpp
View File

@@ -240,8 +240,11 @@ void CMakeCbpParser::parseBuildTarget()
readNext(); readNext();
if (isEndElement()) { if (isEndElement()) {
if (!m_buildTarget.title.endsWith(QLatin1String("/fast")) if (!m_buildTarget.title.endsWith(QLatin1String("/fast"))
&& !m_buildTarget.title.endsWith(QLatin1String("_automoc"))) && !m_buildTarget.title.endsWith(QLatin1String("_automoc"))) {
if (m_buildTarget.executable.isEmpty() && m_buildTarget.targetType == ExecutableType)
m_buildTarget.targetType = UtilityType;
m_buildTargets.append(m_buildTarget); m_buildTargets.append(m_buildTarget);
}
return; return;
} else if (name() == QLatin1String("Compiler")) { } else if (name() == QLatin1String("Compiler")) {
parseCompiler(); parseCompiler();
@@ -264,8 +267,14 @@ void CMakeCbpParser::parseBuildTargetOption()
m_buildTarget.executable = tool->mapAllPaths(m_kit, m_buildTarget.executable); m_buildTarget.executable = tool->mapAllPaths(m_kit, m_buildTarget.executable);
} else if (attributes().hasAttribute(QLatin1String("type"))) { } else if (attributes().hasAttribute(QLatin1String("type"))) {
const QStringRef value = attributes().value(QLatin1String("type")); const QStringRef value = attributes().value(QLatin1String("type"));
if (value == QLatin1String("2") || value == QLatin1String("3")) if (value == "0" || value == "1")
m_buildTarget.targetType = TargetType(value.toInt()); m_buildTarget.targetType = ExecutableType;
else if (value == "2")
m_buildTarget.targetType = StaticLibraryType;
else if (value == "3")
m_buildTarget.targetType = DynamicLibraryType;
else
m_buildTarget.targetType = UtilityType;
} 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();

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

@@ -762,7 +762,7 @@ void CMakeBuildTarget::clear()
workingDirectory.clear(); workingDirectory.clear();
sourceDirectory.clear(); sourceDirectory.clear();
title.clear(); title.clear();
targetType = ExecutableType; targetType = UtilityType;
includeFiles.clear(); includeFiles.clear();
compilerOptions.clear(); compilerOptions.clear();
defines.clear(); defines.clear();

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

@@ -70,7 +70,7 @@ class CMAKE_EXPORT CMakeBuildTarget
public: public:
QString title; QString title;
QString executable; // TODO: rename to output? QString executable; // TODO: rename to output?
TargetType targetType; TargetType targetType = UtilityType;
QString workingDirectory; QString workingDirectory;
QString sourceDirectory; QString sourceDirectory;
QString makeCommand; QString makeCommand;