mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 08:20:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmGlobalVisualStudio10Generator: Clarify LoadFlagTable argument name

Browse Source
This commit is contained in:
Brad King
2021-03-04 15:34:34 -05:00
parent cbba9f26a8
commit 414b5e0119
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmGlobalVisualStudio10Generator.cxx
View File

@@ -1366,19 +1366,19 @@ static std::string cmGetFlagTableName(std::string const& toolsetName,
}
cmIDEFlagTable const* cmGlobalVisualStudio10Generator::LoadFlagTable(
std::string const& optionsName, std::string const& defaultName,
std::string const& toolSpecificName, std::string const& defaultName,
std::string const& table) const
{
cmIDEFlagTable const* ret = nullptr;
std::string filename;
if (!optionsName.empty()) {
filename = cmGetFlagTableName(optionsName, table);
if (!toolSpecificName.empty()) {
filename = cmGetFlagTableName(toolSpecificName, table);
ret = cmLoadFlagTableJson(filename);
} else {
std::string const& toolsetName =
std::string const& genericName =
this->CanonicalToolsetName(this->GetPlatformToolsetString());
filename = cmGetFlagTableName(toolsetName, table);
filename = cmGetFlagTableName(genericName, table);
if (cmSystemTools::FileExists(filename)) {
ret = cmLoadFlagTableJson(filename);
} else {

2
Source/cmGlobalVisualStudio10Generator.h
View File

@@ -169,7 +169,7 @@ protected:
std::string const& GetMSBuildCommand();
cmIDEFlagTable const* LoadFlagTable(std::string const& optionsName,
cmIDEFlagTable const* LoadFlagTable(std::string const& toolSpecificName,
std::string const& defaultName,
std::string const& table) const;