diff options
author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2016-02-25 14:18:05 +0100 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2016-02-26 12:17:39 +0000 |
commit | 420e54281c6d95fe8f53c06ef7f6e34b814b4fa5 (patch) | |
tree | 9819e73dc1e5161a86c6c993f9ed93ecad425106 /src/plugins/cmakeprojectmanager/cmakebuildstep.h | |
parent | 76a050cb835b1c297dce42a664cebe4ec4d6ece7 (diff) |
CMake: Keep cmake state in a temporary directory till first build
This avoids creating lots of build directories as the user types
in something into the builddirectory line of the build settings.
Change-Id: Ib08a0f65e08bce104e4baf9e19fb01730d2f5f08
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakebuildstep.h')
-rw-r--r-- | src/plugins/cmakeprojectmanager/cmakebuildstep.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.h b/src/plugins/cmakeprojectmanager/cmakebuildstep.h index b56564ab68..7f4260551b 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.h +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.h @@ -56,6 +56,7 @@ public: CMakeBuildConfiguration *targetsActiveBuildConfiguration() const; bool init(QList<const BuildStep *> &earlierSteps) override; + void run(QFutureInterface<bool> &fi) override; ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; bool immutable() const override; @@ -100,9 +101,14 @@ protected: private: void ctor(ProjectExplorer::BuildStepList *bsl); + void runImpl(QFutureInterface<bool> &fi); + void handleBuildTargetChanges(); CMakeRunConfiguration *targetsActiveRunConfiguration() const; + QMetaObject::Connection m_runTrigger; + QMetaObject::Connection m_errorTrigger; + QRegExp m_percentProgress; QRegExp m_ninjaProgress; QString m_ninjaProgressString; |