feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Make it possible to register multiple cmake instances

Browse Source 
This patch add the CMakeToolManager, a central repository for cmake instances.
One instance is always the currently used "default". By that its possible to
switch between different cmake installations. The next step will be adding
it to the Kits.

Change-Id: I310fdd805e0ed239077a5632303e891dbd1d9ea1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Benjamin Zeller
2015-02-04 17:54:46 +01:00
parent f4a3b4ca5f
commit 99e9643dea
18 changed files with 1173 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/cmakeprojectmanager/cmakesettingspage.h
View File

@@ -32,18 +32,16 @@
#include <coreplugin/dialogs/ioptionspage.h>
#include <utils/pathchooser.h>
#include <texteditor/codeassist/keywordscompletionassist.h>
#include <QPointer>
#include "cmaketool.h"
QT_FORWARD_DECLARE_CLASS(QLabel)
QT_FORWARD_DECLARE_CLASS(QCheckBox)
namespace CMakeProjectManager {
namespace Internal {
class CMakeToolConfigWidget;
class CMakeSettingsPage : public Core::IOptionsPage
{
Q_OBJECT
@@ -56,24 +54,8 @@ public:
void apply();
void finish();
QString cmakeExecutable() const;
void setCMakeExecutable(const QString &executable);
bool isCMakeExecutableValid() const;
bool hasCodeBlocksMsvcGenerator() const;
bool hasCodeBlocksNinjaGenerator() const;
bool preferNinja() const;
TextEditor::Keywords keywords();
private:
void saveSettings() const;
QString findCmakeExecutable() const;
QPointer<QWidget> m_widget;
Utils::PathChooser *m_pathchooser;
QCheckBox *m_preferNinja;
CMakeTool m_cmakeValidatorForUser;
CMakeTool m_cmakeValidatorForSystem;
CMakeToolConfigWidget *m_widget;
};
} // namespace Internal