diff options
author | Brad King <brad.king@kitware.com> | 2011-11-10 22:17:41 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2011-11-14 14:47:31 (GMT) |
commit | 1be4b6f4638334970a3d3f19891b5997ddcf5717 (patch) | |
tree | 7ce46559af786886bb622648efbff68ac4f17d2c /Source/cmLocalVisualStudio7Generator.h | |
parent | 131d0ae4fc4d51fa8175bc3dfd323efccb1cc951 (diff) | |
download | CMake-1be4b6f4638334970a3d3f19891b5997ddcf5717.zip CMake-1be4b6f4638334970a3d3f19891b5997ddcf5717.tar.gz CMake-1be4b6f4638334970a3d3f19891b5997ddcf5717.tar.bz2 |
Order VS local generator Version ivar values consistently
Move the Version member to the top cmLocalVisualStudioGenerator class
and set it consistently for instances created by all the global
generator versions. Use an enumeration type with values scaled by a
factor of 10 so we can handle VS 7.1 without out-of-order numbers.
VS 7.1 support for SuppressStartupBanner was broken by commit 25116a3c
(Fix CMAKE_VERBOSE_MAKEFILE for VS10 vcxproj files, 2011-10-11) because
it assumed comparison of VS version numbers works. Now it does.
Diffstat (limited to 'Source/cmLocalVisualStudio7Generator.h')
-rw-r--r-- | Source/cmLocalVisualStudio7Generator.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.h b/Source/cmLocalVisualStudio7Generator.h index cdd714e..5b634b8 100644 --- a/Source/cmLocalVisualStudio7Generator.h +++ b/Source/cmLocalVisualStudio7Generator.h @@ -35,7 +35,7 @@ class cmLocalVisualStudio7Generator : public cmLocalVisualStudioGenerator { public: ///! Set cache only and recurse to false by default. - cmLocalVisualStudio7Generator(); + cmLocalVisualStudio7Generator(VSVersion v); virtual ~cmLocalVisualStudio7Generator(); @@ -53,9 +53,6 @@ public: */ void SetBuildType(BuildType,const char *name); - void SetVersion71() {this->Version = 71;} - void SetVersion8() {this->Version = 8;} - void SetVersion9() {this->Version = 9;} void SetPlatformName(const char* n) { this->PlatformName = n;} void GetTargetObjectFileDirectories(cmTarget* target, std::vector<std::string>& @@ -130,7 +127,6 @@ private: cmVS7FlagTable const* ExtraFlagTable; std::string ModuleDefinitionFile; - int Version; bool FortranProject; std::string PlatformName; // Win32 or x64 cmLocalVisualStudio7GeneratorInternals* Internal; |