Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
CMake
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Craig Scott
CMake
Commits
67bced8a
Commit
67bced8a
authored
6 years ago
by
Julien Jomier
Browse files
Options
Downloads
Patches
Plain Diff
cmake-gui: Improve label for default platform
Specify the default platform to be used when the platform field is empty
parent
48ec0bc1
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Source/QtDialog/FirstConfigure.cxx
+12
-2
12 additions, 2 deletions
Source/QtDialog/FirstConfigure.cxx
Source/QtDialog/FirstConfigure.h
+1
-0
1 addition, 0 deletions
Source/QtDialog/FirstConfigure.h
with
13 additions
and
2 deletions
Source/QtDialog/FirstConfigure.cxx
+
12
−
2
View file @
67bced8a
...
...
@@ -75,8 +75,7 @@ QFrame* StartCompilerSetup::CreatePlatformWidgets()
QVBoxLayout
*
l
=
new
QVBoxLayout
(
frame
);
l
->
setContentsMargins
(
0
,
0
,
0
,
0
);
this
->
PlatformLabel
=
new
QLabel
(
tr
(
"Specify the platform for this generator"
));
this
->
PlatformLabel
=
new
QLabel
(
tr
(
"Optional platform for generator"
));
l
->
addWidget
(
this
->
PlatformLabel
);
this
->
PlatformOptions
=
new
QComboBox
(
frame
);
...
...
@@ -106,6 +105,10 @@ void StartCompilerSetup::setGenerators(
this
->
GeneratorsSupportingPlatform
.
append
(
QString
::
fromLocal8Bit
(
it
->
name
.
c_str
()));
this
->
GeneratorDefaultPlatform
[
QString
::
fromLocal8Bit
(
it
->
name
.
c_str
())]
=
QString
::
fromLocal8Bit
(
it
->
defaultPlatform
.
c_str
());
std
::
vector
<
std
::
string
>::
const_iterator
platformIt
=
it
->
supportedPlatforms
.
cbegin
();
while
(
platformIt
!=
it
->
supportedPlatforms
.
cend
())
{
...
...
@@ -182,6 +185,13 @@ void StartCompilerSetup::onGeneratorChanged(QString const& name)
// Display the generator platform for the generators supporting it
if
(
GeneratorsSupportingPlatform
.
contains
(
name
))
{
// Change the label title to include the default platform
std
::
string
label
=
"Optional platform for generator"
;
label
+=
"(if empty, generator uses: "
;
label
+=
this
->
GeneratorDefaultPlatform
[
name
].
toStdString
();
label
+=
")"
;
this
->
PlatformLabel
->
setText
(
tr
(
label
.
c_str
()));
// Regenerate the list of supported platform
this
->
PlatformOptions
->
clear
();
QStringList
platform_list
;
...
...
This diff is collapsed.
Click to expand it.
Source/QtDialog/FirstConfigure.h
+
1
−
0
View file @
67bced8a
...
...
@@ -63,6 +63,7 @@ protected:
QStringList
GeneratorsSupportingToolset
;
QStringList
GeneratorsSupportingPlatform
;
QMultiMap
<
QString
,
QString
>
GeneratorSupportedPlatforms
;
QMap
<
QString
,
QString
>
GeneratorDefaultPlatform
;
private:
QFrame
*
CreateToolsetWidgets
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment