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
CMake
CMake
Commits
8ec60c67
Commit
8ec60c67
authored
Jun 06, 2015
by
Stephen Kelly
Committed by
Brad King
Jun 22, 2015
Browse files
cmGlobalGenerator: Create GeneratorTargets with a local generator.
parent
dee197fe
Changes
3
Hide whitespace changes
Inline
Side-by-side
Source/cmGlobalGenerator.cxx
View file @
8ec60c67
...
@@ -1456,9 +1456,10 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo()
...
@@ -1456,9 +1456,10 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo()
}
}
//----------------------------------------------------------------------------
//----------------------------------------------------------------------------
void
cmGlobalGenerator
::
CreateGeneratorTargets
(
cm
Makefile
*
mf
)
void
cmGlobalGenerator
::
CreateGeneratorTargets
(
cm
LocalGenerator
*
lg
)
{
{
cmGeneratorTargetsType
generatorTargets
;
cmGeneratorTargetsType
generatorTargets
;
cmMakefile
*
mf
=
lg
->
GetMakefile
();
cmTargets
&
targets
=
mf
->
GetTargets
();
cmTargets
&
targets
=
mf
->
GetTargets
();
for
(
cmTargets
::
iterator
ti
=
targets
.
begin
();
for
(
cmTargets
::
iterator
ti
=
targets
.
begin
();
ti
!=
targets
.
end
();
++
ti
)
ti
!=
targets
.
end
();
++
ti
)
...
@@ -1487,7 +1488,7 @@ void cmGlobalGenerator::CreateGeneratorTargets()
...
@@ -1487,7 +1488,7 @@ void cmGlobalGenerator::CreateGeneratorTargets()
// Construct per-target generator information.
// Construct per-target generator information.
for
(
unsigned
int
i
=
0
;
i
<
this
->
LocalGenerators
.
size
();
++
i
)
for
(
unsigned
int
i
=
0
;
i
<
this
->
LocalGenerators
.
size
();
++
i
)
{
{
this
->
CreateGeneratorTargets
(
this
->
LocalGenerators
[
i
]
->
GetMakefile
()
);
this
->
CreateGeneratorTargets
(
this
->
LocalGenerators
[
i
]);
}
}
}
}
...
...
Source/cmGlobalGenerator.h
View file @
8ec60c67
...
@@ -483,7 +483,7 @@ private:
...
@@ -483,7 +483,7 @@ private:
// Per-target generator information.
// Per-target generator information.
cmGeneratorTargetsType
GeneratorTargets
;
cmGeneratorTargetsType
GeneratorTargets
;
friend
class
cmake
;
friend
class
cmake
;
void
CreateGeneratorTargets
(
cm
Makefile
*
mf
);
void
CreateGeneratorTargets
(
cm
LocalGenerator
*
lg
);
void
CreateGeneratorTargets
();
void
CreateGeneratorTargets
();
void
ClearGeneratorMembers
();
void
ClearGeneratorMembers
();
...
...
Source/cmake.cxx
View file @
8ec60c67
...
@@ -483,7 +483,7 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
...
@@ -483,7 +483,7 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
std
::
string
linkPath
;
std
::
string
linkPath
;
std
::
string
flags
;
std
::
string
flags
;
std
::
string
linkFlags
;
std
::
string
linkFlags
;
gg
->
CreateGeneratorTargets
(
mf
);
gg
->
CreateGeneratorTargets
(
lg
.
get
()
);
cmGeneratorTarget
*
gtgt
=
gg
->
GetGeneratorTarget
(
tgt
);
cmGeneratorTarget
*
gtgt
=
gg
->
GetGeneratorTarget
(
tgt
);
lg
->
GetTargetFlags
(
linkLibs
,
frameworkPath
,
linkPath
,
flags
,
linkFlags
,
lg
->
GetTargetFlags
(
linkLibs
,
frameworkPath
,
linkPath
,
flags
,
linkFlags
,
gtgt
,
false
);
gtgt
,
false
);
...
...
Write
Preview
Markdown
is supported
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