summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalNMakeMakefileGenerator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-05-03 14:50:34 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-05-14 18:36:27 (GMT)
commit34c9ee2ed75e12c713bb49c699ac1dd882d1b8fa (patch)
tree83940147cdf05b1b82caff2c3f4b640b35ca83c0 /Source/cmGlobalNMakeMakefileGenerator.cxx
parent3837c48334ff670d9132f80e35a31e263b21d3a1 (diff)
downloadCMake-34c9ee2ed75e12c713bb49c699ac1dd882d1b8fa.zip
CMake-34c9ee2ed75e12c713bb49c699ac1dd882d1b8fa.tar.gz
CMake-34c9ee2ed75e12c713bb49c699ac1dd882d1b8fa.tar.bz2
cmLocalGenerator: Require a global generator in the constructor.
Port generator factory methods to pass it.
Diffstat (limited to 'Source/cmGlobalNMakeMakefileGenerator.cxx')
-rw-r--r--Source/cmGlobalNMakeMakefileGenerator.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmGlobalNMakeMakefileGenerator.cxx b/Source/cmGlobalNMakeMakefileGenerator.cxx
index a3b3dd7..2732e22 100644
--- a/Source/cmGlobalNMakeMakefileGenerator.cxx
+++ b/Source/cmGlobalNMakeMakefileGenerator.cxx
@@ -49,11 +49,10 @@ cmLocalGenerator *
cmGlobalNMakeMakefileGenerator::CreateLocalGenerator(cmLocalGenerator* parent)
{
cmLocalUnixMakefileGenerator3* lg =
- new cmLocalUnixMakefileGenerator3(parent);
+ new cmLocalUnixMakefileGenerator3(this, parent);
lg->SetDefineWindowsNULL(true);
lg->SetWindowsShell(true);
lg->SetMakeSilentFlag("/nologo");
- lg->SetGlobalGenerator(this);
lg->SetIgnoreLibPrefix(true);
lg->SetPassMakeflags(true);
lg->SetNMake(true);