diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-05-03 09:10:30 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-05-03 09:42:00 (GMT) |
| commit | a0836ed97804952ace98d2c1d0d46e968a532a3c (patch) | |
| tree | 11c3a118fb30c8cf6eb41eca2898251197edadeb /Source/cmQtAutoGenerators.cxx | |
| parent | cbf143bb76604f576275d96a1e1e4c701680ff29 (diff) | |
| download | CMake-a0836ed97804952ace98d2c1d0d46e968a532a3c.zip CMake-a0836ed97804952ace98d2c1d0d46e968a532a3c.tar.gz CMake-a0836ed97804952ace98d2c1d0d46e968a532a3c.tar.bz2 | |
Port to cmMakefile::GetGlobalGenerator.
Diffstat (limited to 'Source/cmQtAutoGenerators.cxx')
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 91b2b27..457de11 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -396,7 +396,7 @@ bool cmQtAutoGenerators::InitializeAutogenTarget(cmTarget* target) std::vector<std::string> rcc_output; bool const isNinja = - makefile->GetLocalGenerator()->GetGlobalGenerator()->GetName() == "Ninja"; + makefile->GetGlobalGenerator()->GetName() == "Ninja"; if(isNinja #if defined(_WIN32) && !defined(__CYGWIN__) || usePRE_BUILD @@ -524,9 +524,8 @@ static void GetCompileDefinitionsAndDirectories(cmTarget const* target, cmMakefile* makefile = target->GetMakefile(); cmLocalGenerator* localGen = makefile->GetLocalGenerator(); std::vector<std::string> includeDirs; - cmGeneratorTarget *gtgt = target->GetMakefile()->GetLocalGenerator() - ->GetGlobalGenerator() - ->GetGeneratorTarget(target); + cmGeneratorTarget *gtgt = localGen->GetGlobalGenerator() + ->GetGeneratorTarget(target); // 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); |