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/cmGlobalWatcomWMakeGenerator.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/cmGlobalWatcomWMakeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalWatcomWMakeGenerator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmGlobalWatcomWMakeGenerator.cxx b/Source/cmGlobalWatcomWMakeGenerator.cxx index 49c516f..181178f 100644 --- a/Source/cmGlobalWatcomWMakeGenerator.cxx +++ b/Source/cmGlobalWatcomWMakeGenerator.cxx @@ -22,6 +22,10 @@ cmGlobalWatcomWMakeGenerator::cmGlobalWatcomWMakeGenerator() this->ToolSupportsColor = true; this->NeedSymbolicMark = true; this->EmptyRuleHackCommand = "@cd ."; +#ifdef _WIN32 + this->WindowsShell = true; +#endif + this->WatcomWMake = true; } void cmGlobalWatcomWMakeGenerator @@ -47,10 +51,6 @@ cmGlobalWatcomWMakeGenerator::CreateLocalGenerator(cmLocalGenerator* parent) cmLocalUnixMakefileGenerator3* lg = new cmLocalUnixMakefileGenerator3(this, parent); lg->SetDefineWindowsNULL(true); -#ifdef _WIN32 - lg->SetWindowsShell(true); -#endif - lg->SetWatcomWMake(true); lg->SetMakeSilentFlag("-h"); lg->SetIgnoreLibPrefix(true); lg->SetPassMakeflags(false); |