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/cmLocalGenerator.h | |
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/cmLocalGenerator.h')
-rw-r--r-- | Source/cmLocalGenerator.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index 100d27b..47c0877 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -383,6 +383,11 @@ public: std::map<cmSourceFile const*, std::string>& mapping, cmGeneratorTarget const* gt = 0); + bool IsWindowsShell() const; + bool IsWatcomWMake() const; + bool IsMinGWMake() const; + bool IsNMake() const; + protected: ///! put all the libraries for a target on into the given stream virtual void OutputLinkLibraries(std::string& linkLibraries, @@ -457,17 +462,13 @@ protected: std::map<std::string, std::string> UniqueObjectNamesMap; std::string::size_type ObjectPathMax; std::set<std::string> ObjectMaxPathViolations; - bool WindowsShell; - bool WindowsVSIDE; - bool WatcomWMake; - bool MinGWMake; - bool NMake; - bool MSYSShell; + bool LinkScriptShell; bool UseRelativePaths; bool IgnoreLibPrefix; bool Configured; bool EmitUniversalBinaryFlags; + // Hack for ExpandRuleVariable until object-oriented version is // committed. std::string TargetImplib; |