mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-07 15:18:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmGlobalVisualStudio10Generator: Drop default toolset name canonicalization

Browse Source 
The default toolset names are always canonical.
This commit is contained in:
Brad King
2021-03-04 15:25:01 -05:00
parent 99f6f1b3b9
commit d5522f096d
1 changed files with 10 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Source/cmGlobalVisualStudio10Generator.cxx
View File

@@ -1403,72 +1403,55 @@ cmIDEFlagTable const* cmGlobalVisualStudio10Generator::LoadFlagTable(
cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetClFlagTable() const cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetClFlagTable() const
{ {
std::string optionsName = this->GetClFlagTableName(); std::string optionsName = this->GetClFlagTableName();
std::string defaultName = return LoadFlagTable(optionsName, this->DefaultCLFlagTableName, "CL");
this->CanonicalToolsetName(this->DefaultCLFlagTableName);
return LoadFlagTable(optionsName, defaultName, "CL");
} }
cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetCSharpFlagTable() cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetCSharpFlagTable()
const const
{ {
std::string optionsName = this->GetCSharpFlagTableName(); std::string optionsName = this->GetCSharpFlagTableName();
std::string defaultName = return LoadFlagTable(optionsName, this->DefaultCSharpFlagTableName,
this->CanonicalToolsetName(this->DefaultCSharpFlagTableName); "CSharp");
return LoadFlagTable(optionsName, defaultName, "CSharp");
} }
cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetRcFlagTable() const cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetRcFlagTable() const
{ {
std::string optionsName = this->GetRcFlagTableName(); std::string optionsName = this->GetRcFlagTableName();
std::string defaultName = return LoadFlagTable(optionsName, this->DefaultRCFlagTableName, "RC");
this->CanonicalToolsetName(this->DefaultRCFlagTableName);
return LoadFlagTable(optionsName, defaultName, "RC");
} }
cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetLibFlagTable() const cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetLibFlagTable() const
{ {
std::string optionsName = this->GetLibFlagTableName(); std::string optionsName = this->GetLibFlagTableName();
std::string defaultName = return LoadFlagTable(optionsName, this->DefaultLibFlagTableName, "LIB");
this->CanonicalToolsetName(this->DefaultLibFlagTableName);
return LoadFlagTable(optionsName, defaultName, "LIB");
} }
cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetLinkFlagTable() const cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetLinkFlagTable() const
{ {
std::string optionsName = this->GetLinkFlagTableName(); std::string optionsName = this->GetLinkFlagTableName();
std::string defaultName = return LoadFlagTable(optionsName, this->DefaultLinkFlagTableName, "Link");
this->CanonicalToolsetName(this->DefaultLinkFlagTableName);
return LoadFlagTable(optionsName, defaultName, "Link");
} }
cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetCudaFlagTable() const cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetCudaFlagTable() const
{ {
std::string defaultName = return LoadFlagTable("", this->DefaultCudaFlagTableName, "Cuda");
this->CanonicalToolsetName(this->DefaultCudaFlagTableName);
return LoadFlagTable("", defaultName, "Cuda");
} }
cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetCudaHostFlagTable() cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetCudaHostFlagTable()
const const
{ {
std::string defaultName = return LoadFlagTable("", this->DefaultCudaHostFlagTableName, "CudaHost");
this->CanonicalToolsetName(this->DefaultCudaHostFlagTableName);
return LoadFlagTable("", defaultName, "CudaHost");
} }
cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetMasmFlagTable() const cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetMasmFlagTable() const
{ {
std::string optionsName = this->GetMasmFlagTableName(); std::string optionsName = this->GetMasmFlagTableName();
std::string defaultName = return LoadFlagTable(optionsName, this->DefaultMasmFlagTableName, "MASM");
this->CanonicalToolsetName(this->DefaultMasmFlagTableName);
return LoadFlagTable(optionsName, defaultName, "MASM");
} }
cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetNasmFlagTable() const cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetNasmFlagTable() const
{ {
std::string defaultName = return LoadFlagTable("", this->DefaultNasmFlagTableName, "NASM");
this->CanonicalToolsetName(this->DefaultNasmFlagTableName);
return LoadFlagTable("", defaultName, "NASM");
} }
std::string cmGlobalVisualStudio10Generator::GetClFlagTableName() const std::string cmGlobalVisualStudio10Generator::GetClFlagTableName() const