kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VS: Change variable type of ArchitectureId from const char* to string

This commit is contained in:
Patrick Gansterer 2012-11-20 11:37:32 +01:00 committed by Brad King
parent 332dc09d0d
commit 102521b6b3
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmGlobalVisualStudio10Generator.cxx
View File

@ -144,8 +144,7 @@ void cmGlobalVisualStudio10Generator
::EnableLanguage(std::vector<std::string>const & lang, ::EnableLanguage(std::vector<std::string>const & lang,
cmMakefile *mf, bool optional) cmMakefile *mf, bool optional)
{ {
if(!strcmp(this->ArchitectureId, "Itanium") || if(this->ArchitectureId == "Itanium" || this->ArchitectureId == "x64")
!strcmp(this->ArchitectureId, "x64"))
{ {
if(this->IsExpressEdition() && !this->Find64BitTools(mf)) if(this->IsExpressEdition() && !this->Find64BitTools(mf))
{ {

4
Source/cmGlobalVisualStudio8Generator.cxx
View File

@ -79,11 +79,11 @@ cmGlobalVisualStudio8Generator::cmGlobalVisualStudio8Generator(
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
const char* cmGlobalVisualStudio8Generator::GetPlatformName() const const char* cmGlobalVisualStudio8Generator::GetPlatformName() const
{ {
if (!strcmp(this->ArchitectureId, "X86")) if (this->ArchitectureId == "X86")
{ {
return "Win32"; return "Win32";
} }
return this->ArchitectureId; return this->ArchitectureId.c_str();
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

4
Source/cmGlobalVisualStudioGenerator.cxx
View File

@ -499,8 +499,8 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmGlobalVisualStudioGenerator::AddPlatformDefinitions(cmMakefile* mf) void cmGlobalVisualStudioGenerator::AddPlatformDefinitions(cmMakefile* mf)
{ {
mf->AddDefinition("MSVC_C_ARCHITECTURE_ID", this->ArchitectureId); mf->AddDefinition("MSVC_C_ARCHITECTURE_ID", this->ArchitectureId.c_str());
mf->AddDefinition("MSVC_CXX_ARCHITECTURE_ID", this->ArchitectureId); mf->AddDefinition("MSVC_CXX_ARCHITECTURE_ID", this->ArchitectureId.c_str());
if(this->AdditionalPlatformDefinition) if(this->AdditionalPlatformDefinition)
{ {

2
Source/cmGlobalVisualStudioGenerator.h
View File

@ -101,7 +101,7 @@ protected:
std::string GetUtilityDepend(cmTarget* target); std::string GetUtilityDepend(cmTarget* target);
typedef std::map<cmTarget*, cmStdString> UtilityDependsMap; typedef std::map<cmTarget*, cmStdString> UtilityDependsMap;
UtilityDependsMap UtilityDepends; UtilityDependsMap UtilityDepends;
const char* ArchitectureId; std::string ArchitectureId;
const char* AdditionalPlatformDefinition; const char* AdditionalPlatformDefinition;
private: private: