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
e7714235
Commit
e7714235
authored
Jun 06, 2015
by
Stephen Kelly
Committed by
Brad King
Jun 22, 2015
Browse files
Get the local generator from the GeneratorTarget.
The Makefile should not know the LocalGenerator at all
parent
5aa556be
Changes
4
Hide whitespace changes
Inline
Side-by-side
Source/cmMakefileTargetGenerator.cxx
View file @
e7714235
...
@@ -1173,8 +1173,10 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
...
@@ -1173,8 +1173,10 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
&&
linkee
->
GetType
()
!=
cmTarget
::
INTERFACE_LIBRARY
&&
linkee
->
GetType
()
!=
cmTarget
::
INTERFACE_LIBRARY
&&
emitted
.
insert
(
linkee
).
second
)
&&
emitted
.
insert
(
linkee
).
second
)
{
{
cmGeneratorTarget
*
gt
=
this
->
GlobalGenerator
->
GetGeneratorTarget
(
linkee
);
cmLocalGenerator
*
lg
=
gt
->
GetLocalGenerator
();
cmMakefile
*
mf
=
linkee
->
GetMakefile
();
cmMakefile
*
mf
=
linkee
->
GetMakefile
();
cmLocalGenerator
*
lg
=
mf
->
GetLocalGenerator
();
std
::
string
di
=
mf
->
GetCurrentBinaryDirectory
();
std
::
string
di
=
mf
->
GetCurrentBinaryDirectory
();
di
+=
"/"
;
di
+=
"/"
;
di
+=
lg
->
GetTargetDirectory
(
*
linkee
);
di
+=
lg
->
GetTargetDirectory
(
*
linkee
);
...
...
Source/cmOSXBundleGenerator.cxx
View file @
e7714235
...
@@ -22,7 +22,7 @@ cmOSXBundleGenerator(cmGeneratorTarget* target,
...
@@ -22,7 +22,7 @@ cmOSXBundleGenerator(cmGeneratorTarget* target,
const
std
::
string
&
configName
)
const
std
::
string
&
configName
)
:
GT
(
target
)
:
GT
(
target
)
,
Makefile
(
target
->
Target
->
GetMakefile
())
,
Makefile
(
target
->
Target
->
GetMakefile
())
,
LocalGenerator
(
Makefile
->
GetLocalGenerator
())
,
LocalGenerator
(
target
->
GetLocalGenerator
())
,
ConfigName
(
configName
)
,
ConfigName
(
configName
)
,
MacContentFolders
(
0
)
,
MacContentFolders
(
0
)
{
{
...
...
Source/cmQtAutoGenerators.cxx
View file @
e7714235
...
@@ -521,10 +521,10 @@ static void GetCompileDefinitionsAndDirectories(cmTarget const* target,
...
@@ -521,10 +521,10 @@ static void GetCompileDefinitionsAndDirectories(cmTarget const* target,
std
::
string
&
defs
)
std
::
string
&
defs
)
{
{
cmMakefile
*
makefile
=
target
->
GetMakefile
();
cmMakefile
*
makefile
=
target
->
GetMakefile
();
cm
Loc
alGenerator
*
lo
c
alGen
=
makefile
->
Get
Loc
alGenerator
();
cm
Glob
alGenerator
*
g
lo
b
alGen
=
makefile
->
Get
Glob
alGenerator
();
std
::
vector
<
std
::
string
>
includeDirs
;
std
::
vector
<
std
::
string
>
includeDirs
;
cmGeneratorTarget
*
gtgt
=
lo
c
alGen
->
GetG
lobalG
enerator
()
cmGeneratorTarget
*
gtgt
=
g
lo
b
alGen
->
GetGenerator
Target
(
target
);
->
GetGeneratorTarget
(
target
);
cmLocalGenerator
*
localGen
=
gtgt
->
GetLocalGenerator
(
);
// Get the include dirs for this target, without stripping the implicit
// Get the include dirs for this target, without stripping the implicit
// include dirs off, see http://public.kitware.com/Bug/view.php?id=13667
// include dirs off, see http://public.kitware.com/Bug/view.php?id=13667
localGen
->
GetIncludeDirectories
(
includeDirs
,
gtgt
,
"CXX"
,
config
,
false
);
localGen
->
GetIncludeDirectories
(
includeDirs
,
gtgt
,
"CXX"
,
config
,
false
);
...
...
Source/cmVisualStudio10TargetGenerator.cxx
View file @
e7714235
...
@@ -176,7 +176,7 @@ cmVisualStudio10TargetGenerator(cmTarget* target,
...
@@ -176,7 +176,7 @@ cmVisualStudio10TargetGenerator(cmTarget* target,
this
->
Makefile
->
GetConfigurations
(
this
->
Configurations
);
this
->
Makefile
->
GetConfigurations
(
this
->
Configurations
);
this
->
LocalGenerator
=
this
->
LocalGenerator
=
(
cmLocalVisualStudio7Generator
*
)
(
cmLocalVisualStudio7Generator
*
)
this
->
Makefile
->
GetLocalGenerator
();
this
->
GeneratorTarget
->
GetLocalGenerator
();
this
->
Name
=
this
->
Target
->
GetName
();
this
->
Name
=
this
->
Target
->
GetName
();
this
->
GUID
=
this
->
GlobalGenerator
->
GetGUID
(
this
->
Name
.
c_str
());
this
->
GUID
=
this
->
GlobalGenerator
->
GetGUID
(
this
->
Name
.
c_str
());
this
->
Platform
=
gg
->
GetPlatformName
();
this
->
Platform
=
gg
->
GetPlatformName
();
...
...
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