mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-16 04:02:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmLocalGenerator: Switch order of <LANG>_{EXTENSIONS,STANDARD} check

Browse Source
This commit is contained in:
Brad King
2017-06-29 13:16:45 -04:00
parent 0fc2d78ee9
commit 8cd28bb0e5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmLocalGenerator.cxx
View File

@@ -1488,11 +1488,6 @@ void cmLocalGenerator::AddCompilerRequirementFlag(
// This compiler has no notion of language standard levels. // This compiler has no notion of language standard levels.
return; return;
} }
std::string stdProp = lang + "_STANDARD";
const char* standardProp = target->GetProperty(stdProp);
if (!standardProp) {
return;
}
std::string extProp = lang + "_EXTENSIONS"; std::string extProp = lang + "_EXTENSIONS";
bool ext = true; bool ext = true;
if (const char* extPropValue = target->GetProperty(extProp)) { if (const char* extPropValue = target->GetProperty(extProp)) {
@@ -1500,6 +1495,11 @@ void cmLocalGenerator::AddCompilerRequirementFlag(
ext = false; ext = false;
} }
} }
std::string stdProp = lang + "_STANDARD";
const char* standardProp = target->GetProperty(stdProp);
if (!standardProp) {
return;
}
std::string const type = ext ? "EXTENSION" : "STANDARD"; std::string const type = ext ? "EXTENSION" : "STANDARD";