diff options
| author | Brad King <brad.king@kitware.com> | 2012-08-23 15:20:48 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-08-30 13:42:40 (GMT) |
| commit | 485a940e4c2b07f08e70b6e04733feb724bb6f3f (patch) | |
| tree | b9d56a7526ba4a951d6c8e83f9c83053cb44c809 /Source/cmGlobalVisualStudioGenerator.cxx | |
| parent | 32db033b2713d40899865a06f03d83373078eaa3 (diff) | |
| download | CMake-485a940e4c2b07f08e70b6e04733feb724bb6f3f.zip CMake-485a940e4c2b07f08e70b6e04733feb724bb6f3f.tar.gz CMake-485a940e4c2b07f08e70b6e04733feb724bb6f3f.tar.bz2 | |
VS: Simplify MSVC version reporting
Teach Windows-cl.cmake to use CMAKE_(C|CXX)_COMPILER_VERSION to set the
"MSVC##" and MSVC_VERSION variables. It no longer needs the IDE generator
to dictate the version or to detect the version by running the
command-line tool for NMake and Ninja generators. Drop configuration of
CMakeCPlatform.cmake and CMakeCXXPlatform.cmake from Windows-cl.cmake.in
because all the results it saved are now cheap to compute every time.
Diffstat (limited to 'Source/cmGlobalVisualStudioGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudioGenerator.cxx | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index feb3ac9..0968b77 100644 --- a/Source/cmGlobalVisualStudioGenerator.cxx +++ b/Source/cmGlobalVisualStudioGenerator.cxx @@ -22,7 +22,6 @@ cmGlobalVisualStudioGenerator::cmGlobalVisualStudioGenerator() { this->ArchitectureId = "X86"; - this->VersionId = 0; } //---------------------------------------------------------------------------- @@ -495,11 +494,6 @@ void cmGlobalVisualStudioGenerator::AddPlatformDefinitions(cmMakefile* mf) { mf->AddDefinition("MSVC_C_ARCHITECTURE_ID", this->ArchitectureId); mf->AddDefinition("MSVC_CXX_ARCHITECTURE_ID", this->ArchitectureId); - - if (this->VersionId) - { - mf->AddDefinition(this->VersionId, "1"); - } } //---------------------------------------------------------------------------- |