kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmMakefile: Port messages for compile features to cmake

Browse Source
This commit is contained in:
Stephen Kelly 2016-01-28 22:10:27 +01:00
parent df8c3130d6
commit ea5324cd4b
2 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Source/cmMakefile.cxx
View File

@ -3997,14 +3997,20 @@ bool cmMakefile::AddRequiredTargetFeature(cmTarget* target,
<< this->GetDefinition("CMAKE_" + lang + "_COMPILER_ID") << this->GetDefinition("CMAKE_" + lang + "_COMPILER_ID")
<< "\"\nversion " << "\"\nversion "
<< this->GetDefinition("CMAKE_" + lang + "_COMPILER_VERSION") << "."; << this->GetDefinition("CMAKE_" + lang + "_COMPILER_VERSION") << ".";
this->IssueMessage(cmake::FATAL_ERROR, e.str()); if (error) {
*error = e.str();
} else {
this->GetCMakeInstance()->IssueMessage(cmake::FATAL_ERROR, e.str(),
this->Backtrace);
}
return false; return false;
} }
target->AppendProperty("COMPILE_FEATURES", feature.c_str()); target->AppendProperty("COMPILE_FEATURES", feature.c_str());
return lang == "C" ? this->AddRequiredTargetCFeature(target, feature) return lang == "C"
: this->AddRequiredTargetCxxFeature(target, feature); ? this->AddRequiredTargetCFeature(target, feature, error)
: this->AddRequiredTargetCxxFeature(target, feature, error);
} }
bool cmMakefile::CompileFeatureKnown(cmTarget const* target, bool cmMakefile::CompileFeatureKnown(cmTarget const* target,
@ -4040,7 +4046,8 @@ bool cmMakefile::CompileFeatureKnown(cmTarget const* target,
if (error) { if (error) {
*error = e.str(); *error = e.str();
} else { } else {
this->IssueMessage(cmake::FATAL_ERROR, e.str()); this->GetCMakeInstance()->IssueMessage(cmake::FATAL_ERROR, e.str(),
this->Backtrace);
} }
return false; return false;
} }
@ -4065,7 +4072,8 @@ const char* cmMakefile::CompileFeaturesAvailable(const std::string& lang,
if (error) { if (error) {
*error = e.str(); *error = e.str();
} else { } else {
this->IssueMessage(cmake::FATAL_ERROR, e.str()); this->GetCMakeInstance()->IssueMessage(cmake::FATAL_ERROR, e.str(),
this->Backtrace);
} }
return 0; return 0;
} }
@ -4252,7 +4260,8 @@ void cmMakefile::CheckNeededCxxLanguage(const std::string& feature,
} }
bool cmMakefile::AddRequiredTargetCxxFeature(cmTarget* target, bool cmMakefile::AddRequiredTargetCxxFeature(cmTarget* target,
const std::string& feature) const const std::string& feature,
std::string* error) const
{ {
bool needCxx98 = false; bool needCxx98 = false;
bool needCxx11 = false; bool needCxx11 = false;
@ -4268,7 +4277,12 @@ bool cmMakefile::AddRequiredTargetCxxFeature(cmTarget* target,
std::ostringstream e; std::ostringstream e;
e << "The CXX_STANDARD property on target \"" << target->GetName() e << "The CXX_STANDARD property on target \"" << target->GetName()
<< "\" contained an invalid value: \"" << existingCxxStandard << "\"."; << "\" contained an invalid value: \"" << existingCxxStandard << "\".";
this->IssueMessage(cmake::FATAL_ERROR, e.str()); if (error) {
*error = e.str();
} else {
this->GetCMakeInstance()->IssueMessage(cmake::FATAL_ERROR, e.str(),
this->Backtrace);
}
return false; return false;
} }
} }
@ -4333,7 +4347,8 @@ void cmMakefile::CheckNeededCLanguage(const std::string& feature,
} }
bool cmMakefile::AddRequiredTargetCFeature(cmTarget* target, bool cmMakefile::AddRequiredTargetCFeature(cmTarget* target,
const std::string& feature) const const std::string& feature,
std::string* error) const
{ {
bool needC90 = false; bool needC90 = false;
bool needC99 = false; bool needC99 = false;
@ -4348,7 +4363,12 @@ bool cmMakefile::AddRequiredTargetCFeature(cmTarget* target,
std::ostringstream e; std::ostringstream e;
e << "The C_STANDARD property on target \"" << target->GetName() e << "The C_STANDARD property on target \"" << target->GetName()
<< "\" contained an invalid value: \"" << existingCStandard << "\"."; << "\" contained an invalid value: \"" << existingCStandard << "\".";
this->IssueMessage(cmake::FATAL_ERROR, e.str()); if (error) {
*error = e.str();
} else {
this->GetCMakeInstance()->IssueMessage(cmake::FATAL_ERROR, e.str(),
this->Backtrace);
}
return false; return false;
} }
} }

7
Source/cmMakefile.h
View File

@ -928,11 +928,12 @@ private:
std::vector<cmSourceFile*> QtUiFilesWithOptions; std::vector<cmSourceFile*> QtUiFilesWithOptions;
bool AddRequiredTargetCFeature(cmTarget* target, bool AddRequiredTargetCFeature(cmTarget* target, const std::string& feature,
const std::string& feature) const; std::string* error = 0) const;
bool AddRequiredTargetCxxFeature(cmTarget* target, bool AddRequiredTargetCxxFeature(cmTarget* target,
const std::string& feature) const; const std::string& feature,
std::string* error = 0) const;
void CheckNeededCLanguage(const std::string& feature, bool& needC90, void CheckNeededCLanguage(const std::string& feature, bool& needC90,
bool& needC99, bool& needC11) const; bool& needC99, bool& needC11) const;