diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-06-06 12:59:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-06-22 17:23:46 (GMT) |
| commit | e77142350de1dec03ca788e3d3e278b7b9358fb5 (patch) | |
| tree | d3e50ef3ef2352753a429010f0a09d2227fe7393 /Source/cmQtAutoGenerators.cxx | |
| parent | 5aa556be560b782d149b53bccc12dfc2be2bda0b (diff) | |
| download | CMake-e77142350de1dec03ca788e3d3e278b7b9358fb5.zip CMake-e77142350de1dec03ca788e3d3e278b7b9358fb5.tar.gz CMake-e77142350de1dec03ca788e3d3e278b7b9358fb5.tar.bz2 | |
Get the local generator from the GeneratorTarget.
The Makefile should not know the LocalGenerator at all
Diffstat (limited to 'Source/cmQtAutoGenerators.cxx')
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 53fea83..b03e45a 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -521,10 +521,10 @@ static void GetCompileDefinitionsAndDirectories(cmTarget const* target, std::string &defs) { cmMakefile* makefile = target->GetMakefile(); - cmLocalGenerator* localGen = makefile->GetLocalGenerator(); + cmGlobalGenerator* globalGen = makefile->GetGlobalGenerator(); std::vector<std::string> includeDirs; - cmGeneratorTarget *gtgt = localGen->GetGlobalGenerator() - ->GetGeneratorTarget(target); + cmGeneratorTarget *gtgt = globalGen->GetGeneratorTarget(target); + cmLocalGenerator *localGen = gtgt->GetLocalGenerator(); // Get the include dirs for this target, without stripping the implicit // include dirs off, see http://public.kitware.com/Bug/view.php?id=13667 localGen->GetIncludeDirectories(includeDirs, gtgt, "CXX", config, false); |