kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmQtAutoGenerators: Prefer a generator to access global generator.

Browse Source
This commit is contained in:
Stephen Kelly 2015-08-02 20:39:24 +02:00
parent 5f66900e71
commit 6d8a125e49
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmQtAutoGenerators.cxx
View File

@ -369,7 +369,7 @@ bool cmQtAutoGenerators::InitializeAutogenTarget(cmLocalGenerator* lg,
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32) && !defined(__CYGWIN__)
bool usePRE_BUILD = false; bool usePRE_BUILD = false;
cmGlobalGenerator* gg = makefile->GetGlobalGenerator(); cmGlobalGenerator* gg = lg->GetGlobalGenerator();
if(gg->GetName().find("Visual Studio") != std::string::npos) if(gg->GetName().find("Visual Studio") != std::string::npos)
{ {
cmGlobalVisualStudioGenerator* vsgg = cmGlobalVisualStudioGenerator* vsgg =
@ -396,7 +396,7 @@ bool cmQtAutoGenerators::InitializeAutogenTarget(cmLocalGenerator* lg,
std::vector<std::string> rcc_output; std::vector<std::string> rcc_output;
bool const isNinja = bool const isNinja =
makefile->GetGlobalGenerator()->GetName() == "Ninja"; lg->GetGlobalGenerator()->GetName() == "Ninja";
if(isNinja if(isNinja
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32) && !defined(__CYGWIN__)
|| usePRE_BUILD || usePRE_BUILD