mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-12-31 10:50:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmGeneratorTarget: Clarify name of language property lookup helper

Browse Source
This commit is contained in:
Justin Goshi
2020-06-18 15:42:15 -07:00
committed by Brad King
parent 01fdd421bb
commit e43486a639
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmGeneratorTarget.cxx
View File

@@ -959,16 +959,17 @@ cmProp cmGeneratorTarget::GetLanguageStandard(std::string const& lang,
return this->Target->GetProperty(cmStrCat(lang, "_STANDARD"));
}
cmProp cmGeneratorTarget::GetLanguageStandardProperty(std::string const& lang,
const char* suffix) const
cmProp cmGeneratorTarget::GetPropertyWithPairedLanguageSupport(
std::string const& lang, const char* suffix) const
{
cmProp propertyValue = this->Target->GetProperty(cmStrCat(lang, suffix));
if (propertyValue == nullptr) {
// Check if we should use the value set by another language.
if (lang == "OBJC") {
propertyValue = this->GetLanguageStandardProperty("C", suffix);
propertyValue = this->GetPropertyWithPairedLanguageSupport("C", suffix);
} else if (lang == "OBJCXX" || lang == "CUDA") {
propertyValue = this->GetLanguageStandardProperty("CXX", suffix);
propertyValue =
this->GetPropertyWithPairedLanguageSupport("CXX", suffix);
}
}
return propertyValue;
@@ -976,13 +977,14 @@ cmProp cmGeneratorTarget::GetLanguageStandardProperty(std::string const& lang,
cmProp cmGeneratorTarget::GetLanguageExtensions(std::string const& lang) const
{
return this->GetLanguageStandardProperty(lang, "_EXTENSIONS");
return this->GetPropertyWithPairedLanguageSupport(lang, "_EXTENSIONS");
}
bool cmGeneratorTarget::GetLanguageStandardRequired(
std::string const& lang) const
{
cmProp p = this->GetLanguageStandardProperty(lang, "_STANDARD_REQUIRED");
cmProp p =
this->GetPropertyWithPairedLanguageSupport(lang, "_STANDARD_REQUIRED");
return p && cmIsOn(*p);
}

4
Source/cmGeneratorTarget.h
View File

@@ -1052,8 +1052,8 @@ private:
mutable std::map<std::string, std::string> LanguageStandardMap;
cmProp GetLanguageStandardProperty(std::string const& lang,
const char* suffix) const;
cmProp GetPropertyWithPairedLanguageSupport(std::string const& lang,
const char* suffix) const;
public:
const std::vector<const cmGeneratorTarget*>& GetLinkImplementationClosure(