diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-08-24 07:08:29 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-08-25 21:06:33 (GMT) |
| commit | 7f551b4f2635816553c2ff7dacef78254875116e (patch) | |
| tree | 4a903b0e6a49e36cbd47479891a67d3fbba05a1d /Source | |
| parent | cd6293cdf8cf04fca70497a2474989b773fe922e (diff) | |
| download | CMake-7f551b4f2635816553c2ff7dacef78254875116e.zip CMake-7f551b4f2635816553c2ff7dacef78254875116e.tar.gz CMake-7f551b4f2635816553c2ff7dacef78254875116e.tar.bz2 | |
cmGlobalGenerator: Implement VS6 check without virtual method.
Don't require existence of a global generator for this check.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalGenerator.h | 2 | ||||
| -rw-r--r-- | Source/cmGlobalVisualStudio6Generator.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index fe710f1..3403cf9 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -242,7 +242,7 @@ public: #if defined(_WIN32) && !defined(__CYGWIN__) /** Is this the Visual Studio 6 generator? */ - virtual bool IsForVS6() const { return false; } + bool IsForVS6() const { return this->GetName() == "Visual Studio 6"; } #endif ///! Find a target by name by searching the local generators. diff --git a/Source/cmGlobalVisualStudio6Generator.h b/Source/cmGlobalVisualStudio6Generator.h index 2460158..420cb0b 100644 --- a/Source/cmGlobalVisualStudio6Generator.h +++ b/Source/cmGlobalVisualStudio6Generator.h @@ -85,8 +85,6 @@ public: virtual void FindMakeProgram(cmMakefile*); - virtual bool IsForVS6() const { return true; } - protected: virtual void Generate(); virtual const char* GetIDEVersion() { return "6.0"; } |