From 3c84660ac417ddbcc4bfd9e7df5f44859990d85c Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 9 Jul 2015 13:27:27 +0200 Subject: AutoTools: Improve parsing of CPPFLAGS Change-Id: I55019b37a883fca7241aa27bf27e45b03c4262c2 Reviewed-by: Daniel Teske Reviewed-by: hjk --- .../autotoolsprojectmanager/makefileparser.cpp | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'src/plugins/autotoolsprojectmanager/makefileparser.cpp') diff --git a/src/plugins/autotoolsprojectmanager/makefileparser.cpp b/src/plugins/autotoolsprojectmanager/makefileparser.cpp index 53a79134a6..b3284243eb 100644 --- a/src/plugins/autotoolsprojectmanager/makefileparser.cpp +++ b/src/plugins/autotoolsprojectmanager/makefileparser.cpp @@ -131,12 +131,12 @@ QByteArray MakefileParser::defines() const QStringList MakefileParser::cflags() const { - return m_cflags; + return m_cppflags + m_cflags; } QStringList MakefileParser::cxxflags() const { - return m_cxxflags; + return m_cppflags + m_cxxflags; } void MakefileParser::cancel() @@ -506,6 +506,15 @@ bool MakefileParser::maybeParseCXXFlag(const QString &term) return false; } +bool MakefileParser::maybeParseCPPFlag(const QString &term) +{ + if (term.startsWith(QLatin1Char('-'))) { + m_cppflags += term; + return true; + } + return false; +} + void MakefileParser::addAllSources() { QStringList extensions; @@ -550,11 +559,14 @@ void MakefileParser::parseIncludePaths() foreach (const QString &term, parseTermsAfterAssign(line)) maybeParseDefine(term) || maybeParseInclude(term, dirName) || maybeParseCFlag(term); - } else if (varName.endsWith(QLatin1String("CPPFLAGS")) - || varName.endsWith(QLatin1String("CXXFLAGS"))) { + } else if (varName.endsWith(QLatin1String("CXXFLAGS"))) { foreach (const QString &term, parseTermsAfterAssign(line)) maybeParseDefine(term) || maybeParseInclude(term, dirName) || maybeParseCXXFlag(term); + } else if (varName.endsWith(QLatin1String("CPPFLAGS"))) { + foreach (const QString &term, parseTermsAfterAssign(line)) + maybeParseDefine(term) || maybeParseInclude(term, dirName) + || maybeParseCPPFlag(term); } } while (!line.isNull()); -- cgit v1.2.1