CMake: Fix parsing of C++ defines

Partially revert 20cfccd753 that somehow
assumed that compiler flags would also include the defines.

See comment on
Task-number: QTCREATORBUG-3922

Change-Id: Ic7cb9dfa33f53fde9302f38018102c15cb12f83d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2013-03-11 17:15:54 +01:00
parent b2d9290c40
commit 018083ee12
2 changed files with 19 additions and 1 deletions

View File

@@ -162,6 +162,7 @@ public:
QList<ProjectExplorer::FileNode *> cmakeFileList();
QStringList includeFiles();
QList<CMakeBuildTarget> buildTargets();
QByteArray defines() const;
QString projectName() const;
QString compilerName() const;
bool hasCMakeFiles();
@@ -188,6 +189,7 @@ private:
bool m_parsingCmakeUnit;
QStringList m_includeFiles;
QStringList m_compilerOptions;
QByteArray m_defines;
CMakeBuildTarget m_buildTarget;
QList<CMakeBuildTarget> m_buildTargets;