aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/cmakeprojectmanager/tealeafreader.h
diff options
context:
space:
mode:
authorTobias Hunger <[email protected]>2019-06-05 18:09:02 +0200
committerTobias Hunger <[email protected]>2019-06-07 11:07:07 +0000
commitdaaef73682a58e802750a8ef49da6346abc58ce7 (patch)
tree94ed61a5653ceac1364f514a89a94c20bdf64128 /src/plugins/cmakeprojectmanager/tealeafreader.h
parentc961d9fc9e73411734340dfe48cb7978ec94128d (diff)
CMake: Factor out code to run cmake from tealeafreader
Change-Id: I10947596ce08eb0148a5bf258bdf26cfced43db1 Reviewed-by: Alessandro Portale <[email protected]>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/tealeafreader.h')
-rw-r--r--src/plugins/cmakeprojectmanager/tealeafreader.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/plugins/cmakeprojectmanager/tealeafreader.h b/src/plugins/cmakeprojectmanager/tealeafreader.h
index 6e288cc54f0..847f38d3aa0 100644
--- a/src/plugins/cmakeprojectmanager/tealeafreader.h
+++ b/src/plugins/cmakeprojectmanager/tealeafreader.h
@@ -28,6 +28,7 @@
#include <projectexplorer/toolchain.h>
#include "builddirreader.h"
+#include "cmakeprocess.h"
#include <QRegularExpression>
@@ -62,24 +63,18 @@ public:
CppTools::RawProjectParts createRawProjectParts() const final;
private:
- void cleanUpProcess();
void extractData();
void startCMake(const QStringList &configurationArguments);
void cmakeFinished(int code, QProcess::ExitStatus status);
- void processCMakeOutput();
- void processCMakeError();
QStringList getFlagsFor(const CMakeBuildTarget &buildTarget, QHash<QString, QStringList> &cache, Core::Id lang) const;
bool extractFlagsFromMake(const CMakeBuildTarget &buildTarget, QHash<QString, QStringList> &cache, Core::Id lang) const;
bool extractFlagsFromNinja(const CMakeBuildTarget &buildTarget, QHash<QString, QStringList> &cache, Core::Id lang) const;
- Utils::QtcProcess *m_cmakeProcess = nullptr;
-
- // For error reporting:
- ProjectExplorer::IOutputParser *m_parser = nullptr;
- QFutureInterface<void> *m_future = nullptr;
+ // Process data:
+ std::unique_ptr<CMakeProcess> m_cmakeProcess;
QSet<Utils::FilePath> m_cmakeFiles;
QString m_projectName;