diff options
author | Robert Dailey <rcdailey@gmail.com> | 2015-02-15 19:17:54 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2015-11-17 15:03:10 (GMT) |
commit | 2b958a20275c1c73aee745c29ecf4d2de1377f7b (patch) | |
tree | f5acc4711da7ed70f28a65bcc84ef1af71dcda6c /Source/QtDialog/FirstConfigure.h | |
parent | 30b0db7bb5482258ccdb96d2f0b7aadb5d3b23ac (diff) | |
download | CMake-2b958a20275c1c73aee745c29ecf4d2de1377f7b.zip CMake-2b958a20275c1c73aee745c29ecf4d2de1377f7b.tar.gz CMake-2b958a20275c1c73aee745c29ecf4d2de1377f7b.tar.bz2 |
cmake-gui: Add option to specify generator toolset
The -T parameter to CMake may now be specified through cmake-gui via a
new text field in the first-time configure wizard (below the generator
chooser).
The generator factories specify whether or not they support toolsets.
This information is propagated to the Qt code and used to determine if
the selected generator should also display the optional Toolset widgets.
Diffstat (limited to 'Source/QtDialog/FirstConfigure.h')
-rw-r--r-- | Source/QtDialog/FirstConfigure.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/Source/QtDialog/FirstConfigure.h b/Source/QtDialog/FirstConfigure.h index be390b0..09952b6 100644 --- a/Source/QtDialog/FirstConfigure.h +++ b/Source/QtDialog/FirstConfigure.h @@ -4,6 +4,7 @@ #include <QWizard> #include <QWizardPage> +#include "cmake.h" #include "ui_Compilers.h" #include "ui_CrossCompiler.h" @@ -27,9 +28,10 @@ class StartCompilerSetup : public QWizardPage public: StartCompilerSetup(QWidget* p); ~StartCompilerSetup(); - void setGenerators(const QStringList& gens); + void setGenerators(std::vector<cmake::GeneratorInfo> const& gens); void setCurrentGenerator(const QString& gen); QString getGenerator() const; + QString getToolset() const; bool defaultSetup() const; bool compilerSetup() const; @@ -43,10 +45,18 @@ class StartCompilerSetup : public QWizardPage protected slots: void onSelectionChanged(bool); + void onGeneratorChanged(QString const& name); protected: QComboBox* GeneratorOptions; QRadioButton* CompilerSetupOptions[4]; + QFrame* ToolsetFrame; + QLineEdit* Toolset; + QLabel* ToolsetLabel; + QStringList GeneratorsSupportingToolset; + + private: + QFrame* CreateToolsetWidgets(); }; //! the page that gives basic options for native compilers @@ -140,8 +150,9 @@ public: FirstConfigure(); ~FirstConfigure(); - void setGenerators(const QStringList& gens); + void setGenerators(std::vector<cmake::GeneratorInfo> const& gens); QString getGenerator() const; + QString getToolset() const; bool defaultSetup() const; bool compilerSetup() const; |