diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-17 20:16:10 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-07-17 20:17:35 (GMT) |
| commit | eeb60102e813c6c69546e4257a332ede4e234171 (patch) | |
| tree | f9860ee64eb4ea96425ba99a5c3bcec42d99402a /Source/cmGlobalVisualStudio7Generator.cxx | |
| parent | ecb34faaaba841aac6dae722dd2c6256a1472d74 (diff) | |
| download | CMake-eeb60102e813c6c69546e4257a332ede4e234171.zip CMake-eeb60102e813c6c69546e4257a332ede4e234171.tar.gz CMake-eeb60102e813c6c69546e4257a332ede4e234171.tar.bz2 | |
VS: Refactor CMAKE_FORCE_*64 platform definitions
Remove the general infrastructure for these additional platform
definitions and hard-code the only two special cases that used
it. They are only for historical reasons so no new such cases
should be added.
Diffstat (limited to 'Source/cmGlobalVisualStudio7Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio7Generator.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx index a918d1d..759e81e 100644 --- a/Source/cmGlobalVisualStudio7Generator.cxx +++ b/Source/cmGlobalVisualStudio7Generator.cxx @@ -262,7 +262,14 @@ cmLocalGenerator *cmGlobalVisualStudio7Generator::CreateLocalGenerator() //---------------------------------------------------------------------------- void cmGlobalVisualStudio7Generator::AddPlatformDefinitions(cmMakefile* mf) { - cmGlobalVisualStudioGenerator::AddPlatformDefinitions(mf); + if(this->PlatformName == "x64") + { + mf->AddDefinition("CMAKE_FORCE_WIN64", "TRUE"); + } + else if(this->PlatformName == "Itanium") + { + mf->AddDefinition("CMAKE_FORCE_IA64", "TRUE"); + } mf->AddDefinition("CMAKE_VS_PLATFORM_NAME", this->GetPlatformName().c_str()); mf->AddDefinition("CMAKE_VS_INTEL_Fortran_PROJECT_VERSION", this->GetIntelProjectVersion()); |