echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmStandardLevelResolver: use cmStrCat where possible

Browse Source
This commit is contained in:
Ben Boeckel 2023-08-23 16:11:33 -04:00
parent 0d45d40e13
commit 6f1dae2b01
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/cmStandardLevelResolver.cxx
View File

@ -155,8 +155,8 @@ struct StandardLevelComputer
<< this->Language << *standardProp << "\" "
<< (ext ? "(with compiler extensions)" : "")
<< ". But the current compiler \""
<< makefile->GetSafeDefinition("CMAKE_" + this->Language +
"_COMPILER_ID")
<< makefile->GetSafeDefinition(
cmStrCat("CMAKE_", this->Language, "_COMPILER_ID"))
<< "\" does not support this, or "
"CMake does not know the flags to enable it.";
@ -474,10 +474,11 @@ bool cmStandardLevelResolver::CheckCompileFeaturesAvailable(
std::ostringstream e;
e << "The compiler feature \"" << feature << "\" is not known to " << lang
<< " compiler\n\""
<< this->Makefile->GetSafeDefinition("CMAKE_" + lang + "_COMPILER_ID")
<< this->Makefile->GetSafeDefinition(
cmStrCat("CMAKE_", lang, "_COMPILER_ID"))
<< "\"\nversion "
<< this->Makefile->GetSafeDefinition("CMAKE_" + lang +
"_COMPILER_VERSION")
<< this->Makefile->GetSafeDefinition(
cmStrCat("CMAKE_", lang, "_COMPILER_VERSION"))
<< '.';
if (error) {
*error = e.str();
@ -561,8 +562,8 @@ cmValue cmStandardLevelResolver::CompileFeaturesAvailable(
return nullptr;
}
cmValue featuresKnown =
this->Makefile->GetDefinition("CMAKE_" + lang + "_COMPILE_FEATURES");
cmValue featuresKnown = this->Makefile->GetDefinition(
cmStrCat("CMAKE_", lang, "_COMPILE_FEATURES"));
if (!cmNonempty(featuresKnown)) {
std::ostringstream e;
@ -572,10 +573,11 @@ cmValue cmStandardLevelResolver::CompileFeaturesAvailable(
e << "No";
}
e << " known features for " << lang << " compiler\n\""
<< this->Makefile->GetSafeDefinition("CMAKE_" + lang + "_COMPILER_ID")
<< this->Makefile->GetSafeDefinition(
cmStrCat("CMAKE_", lang, "_COMPILER_ID"))
<< "\"\nversion "
<< this->Makefile->GetSafeDefinition("CMAKE_" + lang +
"_COMPILER_VERSION")
<< this->Makefile->GetSafeDefinition(
cmStrCat("CMAKE_", lang, "_COMPILER_VERSION"))
<< '.';
if (error) {
*error = e.str();