diff options
| author | Patrick Gansterer <paroga@paroga.com> | 2012-07-21 13:37:46 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-08-22 19:08:40 (GMT) |
| commit | 2c7a451de003782b1ba5e47ab377f33f1fa5c4e5 (patch) | |
| tree | 8d5700d778df484bbeab7eb5a893fe346373fce8 /Source/cmGlobalVisualStudio6Generator.cxx | |
| parent | addefc2ae3b33a75a7152730146b46b319118a24 (diff) | |
| download | CMake-2c7a451de003782b1ba5e47ab377f33f1fa5c4e5.zip CMake-2c7a451de003782b1ba5e47ab377f33f1fa5c4e5.tar.gz CMake-2c7a451de003782b1ba5e47ab377f33f1fa5c4e5.tar.bz2 | |
VS: Cleanup AddPlatformDefinitions() of Visual Studio generators
Move adding of definitions into cmGlobalVisualStudioGenerator to
share code and avoid duplicate architecture string literals.
Diffstat (limited to 'Source/cmGlobalVisualStudio6Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio6Generator.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx index cc70341..ca06b66 100644 --- a/Source/cmGlobalVisualStudio6Generator.cxx +++ b/Source/cmGlobalVisualStudio6Generator.cxx @@ -32,6 +32,7 @@ std::string GetVS6TargetName(const std::string& targetName) cmGlobalVisualStudio6Generator::cmGlobalVisualStudio6Generator() { + this->VersionId = "MSVC60"; this->FindMakeProgramFile = "CMakeVS6FindMake.cmake"; } @@ -40,14 +41,12 @@ void cmGlobalVisualStudio6Generator cmMakefile *mf, bool optional) { + cmGlobalVisualStudioGenerator::AddPlatformDefinitions(mf); mf->AddDefinition("CMAKE_GENERATOR_CC", "cl"); mf->AddDefinition("CMAKE_GENERATOR_CXX", "cl"); mf->AddDefinition("CMAKE_GENERATOR_RC", "rc"); mf->AddDefinition("CMAKE_GENERATOR_NO_COMPILER_ENV", "1"); mf->AddDefinition("CMAKE_GENERATOR_Fortran", "ifort"); - mf->AddDefinition("MSVC_C_ARCHITECTURE_ID", "X86"); - mf->AddDefinition("MSVC_CXX_ARCHITECTURE_ID", "X86"); - mf->AddDefinition("MSVC60", "1"); this->GenerateConfigurations(mf); this->cmGlobalGenerator::EnableLanguage(lang, mf, optional); } |