Commit c7d90621 authored by Tobias Hunger's avatar Tobias Hunger
Browse files

CMakeParser: Remove sub-parser setup from CMakeParser



This makes the class more applicable for later re-use.

Change-Id: Ic717dd63962b254fce639061f16b1ca8e12d8098
Reviewed-by: default avatarTim Jenssen <tim.jenssen@theqtcompany.com>
parent d400959d
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsteplist.h>
#include <projectexplorer/deployconfiguration.h> #include <projectexplorer/deployconfiguration.h>
#include <projectexplorer/gnumakeparser.h>
#include <projectexplorer/kitinformation.h> #include <projectexplorer/kitinformation.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
...@@ -204,7 +205,8 @@ bool CMakeBuildStep::init(QList<const BuildStep *> &earlierSteps) ...@@ -204,7 +205,8 @@ bool CMakeBuildStep::init(QList<const BuildStep *> &earlierSteps)
pp->setArguments(arguments); pp->setArguments(arguments);
pp->resolveAll(); pp->resolveAll();
setOutputParser(new CMakeParser()); setOutputParser(new CMakeParser);
appendOutputParser(new GnuMakeParser);
IOutputParser *parser = target()->kit()->createOutputParser(); IOutputParser *parser = target()->kit()->createOutputParser();
if (parser) if (parser)
appendOutputParser(parser); appendOutputParser(parser);
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <projectexplorer/gnumakeparser.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
using namespace CMakeProjectManager; using namespace CMakeProjectManager;
...@@ -50,8 +49,6 @@ CMakeParser::CMakeParser() ...@@ -50,8 +49,6 @@ CMakeParser::CMakeParser()
m_locationLine.setPattern(QLatin1String(LOCATION_LINE_PATTERN)); m_locationLine.setPattern(QLatin1String(LOCATION_LINE_PATTERN));
QTC_CHECK(m_locationLine.isValid()); QTC_CHECK(m_locationLine.isValid());
appendOutputParser(new GnuMakeParser());
} }
void CMakeParser::stdError(const QString &line) void CMakeParser::stdError(const QString &line)
......
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