summaryrefslogtreecommitdiff
path: root/Source/cmGlobalNMakeMakefileGenerator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-04-28 07:50:52 +0200
committerStephen Kelly <steveire@gmail.com>2015-04-28 07:50:52 +0200
commita48aebcb67a66bd2fee1318bb971cc5e3b016410 (patch)
treea93f900fdbcfcccfa80c7c6cd14ac29bbfca03bb /Source/cmGlobalNMakeMakefileGenerator.cxx
parente4c78b37cec74c505e8a4951276c17f7e64e5f67 (diff)
downloadcmake-a48aebcb67a66bd2fee1318bb971cc5e3b016410.tar.gz
cmLocalGenerator: Require a parent in the constructor.
Pass the parent though cmGlobalGenerator::CreateLocalGenerator. This will make it easy to initialize state scopes independent of cmMakefile.
Diffstat (limited to 'Source/cmGlobalNMakeMakefileGenerator.cxx')
-rw-r--r--Source/cmGlobalNMakeMakefileGenerator.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmGlobalNMakeMakefileGenerator.cxx b/Source/cmGlobalNMakeMakefileGenerator.cxx
index 4fbabe4059..a3b3dd7bff 100644
--- a/Source/cmGlobalNMakeMakefileGenerator.cxx
+++ b/Source/cmGlobalNMakeMakefileGenerator.cxx
@@ -45,9 +45,11 @@ void cmGlobalNMakeMakefileGenerator
}
///! Create a local generator appropriate to this Global Generator
-cmLocalGenerator *cmGlobalNMakeMakefileGenerator::CreateLocalGenerator()
+cmLocalGenerator *
+cmGlobalNMakeMakefileGenerator::CreateLocalGenerator(cmLocalGenerator* parent)
{
- cmLocalUnixMakefileGenerator3* lg = new cmLocalUnixMakefileGenerator3;
+ cmLocalUnixMakefileGenerator3* lg =
+ new cmLocalUnixMakefileGenerator3(parent);
lg->SetDefineWindowsNULL(true);
lg->SetWindowsShell(true);
lg->SetMakeSilentFlag("/nologo");