summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalNMakeMakefileGenerator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-05-04 20:40:11 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-05-14 18:36:28 (GMT)
commitb17686d2bbc193f19c60cdf44a228e49b4ffe386 (patch)
treee2af5214e7af7f0b98050429db9ae4d59df3b5db /Source/cmGlobalNMakeMakefileGenerator.cxx
parented41a8e7b4cf665ebab8e4780f8b0b299113fd11 (diff)
downloadCMake-b17686d2bbc193f19c60cdf44a228e49b4ffe386.zip
CMake-b17686d2bbc193f19c60cdf44a228e49b4ffe386.tar.gz
CMake-b17686d2bbc193f19c60cdf44a228e49b4ffe386.tar.bz2
cmGlobalGenerator: Move some flags from cmLocalGenerator.
These flags are global, and so they belong here instead of being set on each local generator.
Diffstat (limited to 'Source/cmGlobalNMakeMakefileGenerator.cxx')
-rw-r--r--Source/cmGlobalNMakeMakefileGenerator.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalNMakeMakefileGenerator.cxx b/Source/cmGlobalNMakeMakefileGenerator.cxx
index 2732e22..98d7fb4 100644
--- a/Source/cmGlobalNMakeMakefileGenerator.cxx
+++ b/Source/cmGlobalNMakeMakefileGenerator.cxx
@@ -19,6 +19,8 @@ cmGlobalNMakeMakefileGenerator::cmGlobalNMakeMakefileGenerator()
this->ForceUnixPaths = false;
this->ToolSupportsColor = true;
this->UseLinkScript = false;
+ this->WindowsShell = true;
+ this->NMake = true;
}
void cmGlobalNMakeMakefileGenerator
@@ -51,11 +53,9 @@ cmGlobalNMakeMakefileGenerator::CreateLocalGenerator(cmLocalGenerator* parent)
cmLocalUnixMakefileGenerator3* lg =
new cmLocalUnixMakefileGenerator3(this, parent);
lg->SetDefineWindowsNULL(true);
- lg->SetWindowsShell(true);
lg->SetMakeSilentFlag("/nologo");
lg->SetIgnoreLibPrefix(true);
lg->SetPassMakeflags(true);
- lg->SetNMake(true);
lg->SetUnixCD(false);
return lg;
}