diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-04 20:34:34 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-03-05 14:34:59 (GMT) |
| commit | 414b5e0119a99de401e1d7aea61428ec2c9311d5 (patch) | |
| tree | 0a492566d748dde576225e50783658395e24ec80 | |
| parent | cbba9f26a891d477851fac1cf1515d69c25d41a9 (diff) | |
| download | CMake-414b5e0119a99de401e1d7aea61428ec2c9311d5.zip CMake-414b5e0119a99de401e1d7aea61428ec2c9311d5.tar.gz CMake-414b5e0119a99de401e1d7aea61428ec2c9311d5.tar.bz2 | |
cmGlobalVisualStudio10Generator: Clarify LoadFlagTable argument name
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 10 | ||||
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index 0c7f1c4..40e30d5 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -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 { diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h index 5160f29..e8f5ab5 100644 --- a/Source/cmGlobalVisualStudio10Generator.h +++ b/Source/cmGlobalVisualStudio10Generator.h @@ -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; |