Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Brad King
CMake
Commits
3e9f6e36
Commit
3e9f6e36
authored
Jun 04, 2014
by
Brad King
Browse files
Xcode: Rename internal variable {Platform => Generator}Toolset
The latter matches with CMAKE_GENERATOR_TOOLSET better.
parent
2336ec51
Changes
2
Show whitespace changes
Inline
Side-by-side
Source/cmGlobalXCodeGenerator.cxx
View file @
3e9f6e36
...
...
@@ -206,7 +206,7 @@ bool cmGlobalXCodeGenerator::SetGeneratorToolset(std::string const& ts)
{
if
(
this
->
XcodeVersion
>=
30
)
{
this
->
Pl
at
f
or
m
Toolset
=
ts
;
this
->
Gener
atorToolset
=
ts
;
return
true
;
}
else
...
...
@@ -239,10 +239,10 @@ void cmGlobalXCodeGenerator::EnableLanguage(std::vector<std::string>const&
}
}
mf
->
AddDefinition
(
"CMAKE_GENERATOR_NO_COMPILER_ENV"
,
"1"
);
if
(
!
this
->
Pl
at
f
or
m
Toolset
.
empty
())
if
(
!
this
->
Gener
atorToolset
.
empty
())
{
mf
->
AddDefinition
(
"CMAKE_XCODE_PLATFORM_TOOLSET"
,
this
->
Pl
at
f
or
m
Toolset
.
c_str
());
this
->
Gener
atorToolset
.
c_str
());
}
this
->
cmGlobalGenerator
::
EnableLanguage
(
lang
,
mf
,
optional
);
const
char
*
osxArch
=
...
...
@@ -3363,10 +3363,10 @@ void cmGlobalXCodeGenerator
buildSettings
->
AddAttribute
(
"MACOSX_DEPLOYMENT_TARGET"
,
this
->
CreateString
(
deploymentTarget
));
}
if
(
!
this
->
Pl
at
f
or
m
Toolset
.
empty
())
if
(
!
this
->
Gener
atorToolset
.
empty
())
{
buildSettings
->
AddAttribute
(
"GCC_VERSION"
,
this
->
CreateString
(
this
->
Pl
at
f
or
m
Toolset
.
c_str
()));
this
->
CreateString
(
this
->
Gener
atorToolset
.
c_str
()));
}
// Put this last so it can override existing settings
...
...
Source/cmGlobalXCodeGenerator.h
View file @
3e9f6e36
...
...
@@ -246,7 +246,7 @@ private:
std
::
map
<
std
::
string
,
cmXCodeObject
*
>
TargetGroup
;
std
::
map
<
std
::
string
,
cmXCodeObject
*
>
FileRefs
;
std
::
vector
<
std
::
string
>
Architectures
;
std
::
string
Pl
at
f
or
m
Toolset
;
std
::
string
Gener
atorToolset
;
};
#endif
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment