cmLocalGenerator: Simplify logic for language standard or extension flag

This commit is contained in:
Brad King
2017-06-29 13:14:53 -04:00
parent 581fda598c
commit 0fc2d78ee9

View File

@@ -1494,15 +1494,15 @@ void cmLocalGenerator::AddCompilerRequirementFlag(
return;
}
std::string extProp = lang + "_EXTENSIONS";
std::string type = "EXTENSION";
bool ext = true;
if (const char* extPropValue = target->GetProperty(extProp)) {
if (cmSystemTools::IsOff(extPropValue)) {
ext = false;
type = "STANDARD";
}
}
std::string const type = ext ? "EXTENSION" : "STANDARD";
if (target->GetPropertyAsBool(lang + "_STANDARD_REQUIRED")) {
std::string option_flag =
"CMAKE_" + lang + standardProp + "_" + type + "_COMPILE_OPTION";