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

cmLocalGenerator: Simplify logic for language standard or extension flag

Browse Source
This commit is contained in:
Brad King
2017-06-29 13:14:53 -04:00
parent 581fda598c
commit 0fc2d78ee9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmLocalGenerator.cxx
View File

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