diff options
author | Patrick Gansterer <paroga@paroga.com> | 2013-08-05 12:57:58 +0200 |
---|---|---|
committer | Patrick Gansterer <paroga@paroga.com> | 2013-08-05 13:38:26 +0200 |
commit | b02f09d4348afedbf9bd6d579344573e3b08b99f (patch) | |
tree | 63952ab64928dad62bea525e0b7020d0c0d05413 /Source/cmGlobalVisualStudio7Generator.cxx | |
parent | 4b15dc855d8f5347169391b6a1a86320f2efaae4 (diff) | |
download | cmake-b02f09d4348afedbf9bd6d579344573e3b08b99f.tar.gz |
VS: Replace ArchitectureId with PlatformName
Since we do not need the information about the target architecture
we can use the PlatformName only to specify the this information.
This also removes setting of the MSVC_*_ARCHITECTURE_ID variable
which is not required, because this variable gets set by the
compiler detection code in CMAKE_DETERMINE_COMPILER_ID_CHECK().
Diffstat (limited to 'Source/cmGlobalVisualStudio7Generator.cxx')
-rw-r--r-- | Source/cmGlobalVisualStudio7Generator.cxx | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx index 812659ef62..b47566561e 100644 --- a/Source/cmGlobalVisualStudio7Generator.cxx +++ b/Source/cmGlobalVisualStudio7Generator.cxx @@ -17,9 +17,16 @@ #include "cmMakefile.h" #include "cmake.h" -cmGlobalVisualStudio7Generator::cmGlobalVisualStudio7Generator() +cmGlobalVisualStudio7Generator::cmGlobalVisualStudio7Generator( + const char* platformName) { this->FindMakeProgramFile = "CMakeVS7FindMake.cmake"; + + if (!platformName) + { + platformName = "Win32"; + } + this->PlatformName = platformName; } @@ -151,20 +158,6 @@ void cmGlobalVisualStudio7Generator::AddPlatformDefinitions(cmMakefile* mf) mf->AddDefinition("CMAKE_VS_PLATFORM_NAME", this->GetPlatformName()); } -//---------------------------------------------------------------------------- -const char* cmGlobalVisualStudio7Generator::GetPlatformName() const -{ - if (!this->PlatformName.empty()) - { - return this->PlatformName.c_str(); - } - if (this->ArchitectureId == "X86") - { - return "Win32"; - } - return this->ArchitectureId.c_str(); -} - void cmGlobalVisualStudio7Generator::GenerateConfigurations(cmMakefile* mf) { // process the configurations |