diff options
| author | Brad King <brad.king@kitware.com> | 2010-08-31 18:37:16 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-08-31 18:37:16 (GMT) |
| commit | 3913bff9865669e24edd6ef9423a4a6153714f22 (patch) | |
| tree | 88612f205240a8473e1725d61c5f2a699c1c3e07 /Source/cmGlobalVisualStudio9Win64Generator.cxx | |
| parent | 1976c45a3c65534966d51b6e2f1d460081bb49b5 (diff) | |
| parent | ef4394defa22ba4288731ae65285c2f33e9e360a (diff) | |
| download | CMake-3913bff9865669e24edd6ef9423a4a6153714f22.zip CMake-3913bff9865669e24edd6ef9423a4a6153714f22.tar.gz CMake-3913bff9865669e24edd6ef9423a4a6153714f22.tar.bz2 | |
Merge topic 'vs-platforms'
ef4394d VS: Add ArchitectureId to VS 8 and 9 generators
4fec681 VS: Map /ENTRY linker option to EntryPointSymbol
be49129 VS: Add more TargetMachine option values
807fca4 VS: Convert PlatformName member to a virtual method
Diffstat (limited to 'Source/cmGlobalVisualStudio9Win64Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio9Win64Generator.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmGlobalVisualStudio9Win64Generator.cxx b/Source/cmGlobalVisualStudio9Win64Generator.cxx index c5b9bab..ff4fd4f 100644 --- a/Source/cmGlobalVisualStudio9Win64Generator.cxx +++ b/Source/cmGlobalVisualStudio9Win64Generator.cxx @@ -16,7 +16,7 @@ cmGlobalVisualStudio9Win64Generator::cmGlobalVisualStudio9Win64Generator() { - this->PlatformName = "x64"; + this->ArchitectureId = "x64"; } ///! Create a local generator appropriate to this Global Generator @@ -24,7 +24,7 @@ cmLocalGenerator *cmGlobalVisualStudio9Win64Generator::CreateLocalGenerator() { cmLocalVisualStudio7Generator *lg = new cmLocalVisualStudio7Generator; lg->SetVersion9(); - lg->SetPlatformName(this->PlatformName.c_str()); + lg->SetPlatformName(this->GetPlatformName()); lg->SetExtraFlagTable(this->GetExtraFlagTableVS8()); lg->SetGlobalGenerator(this); return lg; @@ -45,6 +45,4 @@ void cmGlobalVisualStudio9Win64Generator { cmGlobalVisualStudio9Generator::AddPlatformDefinitions(mf); mf->AddDefinition("CMAKE_FORCE_WIN64", "TRUE"); - mf->AddDefinition("MSVC_C_ARCHITECTURE_ID", "x64"); - mf->AddDefinition("MSVC_CXX_ARCHITECTURE_ID", "x64"); } |