diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-05-04 20:40:11 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2015-05-14 18:36:28 (GMT) |
commit | b17686d2bbc193f19c60cdf44a228e49b4ffe386 (patch) | |
tree | e2af5214e7af7f0b98050429db9ae4d59df3b5db /Source/cmGlobalJOMMakefileGenerator.cxx | |
parent | ed41a8e7b4cf665ebab8e4780f8b0b299113fd11 (diff) | |
download | CMake-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/cmGlobalJOMMakefileGenerator.cxx')
-rw-r--r-- | Source/cmGlobalJOMMakefileGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalJOMMakefileGenerator.cxx b/Source/cmGlobalJOMMakefileGenerator.cxx index 1caa730..25613eb 100644 --- a/Source/cmGlobalJOMMakefileGenerator.cxx +++ b/Source/cmGlobalJOMMakefileGenerator.cxx @@ -19,6 +19,8 @@ cmGlobalJOMMakefileGenerator::cmGlobalJOMMakefileGenerator() this->ForceUnixPaths = false; this->ToolSupportsColor = true; this->UseLinkScript = false; + this->WindowsShell = true; + this->NMake = true; } void cmGlobalJOMMakefileGenerator @@ -51,11 +53,9 @@ cmGlobalJOMMakefileGenerator::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; } |