*** empty log message ***
This commit is contained in:
parent
db2bd57179
commit
94ff97ceed
|
@ -19,6 +19,13 @@
|
||||||
|
|
||||||
bool cmEndIfCommand::InitialPass(std::vector<std::string> const&)
|
bool cmEndIfCommand::InitialPass(std::vector<std::string> const&)
|
||||||
{
|
{
|
||||||
|
const char* versionValue
|
||||||
|
= m_Makefile->GetDefinition("CMAKE_MINIMUM_REQUIRED_VERSION");
|
||||||
|
if (!versionValue || (atof(versionValue) <= 1.4))
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
this->SetError("An ENDIF command was found outside of a proper IF ENDIF structure. Or its arguments did not match the opening IF command.");
|
this->SetError("An ENDIF command was found outside of a proper IF ENDIF structure. Or its arguments did not match the opening IF command.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -81,6 +81,13 @@ ShouldRemove(const char *name, const std::vector<std::string> &args,
|
||||||
void cmIfFunctionBlocker::
|
void cmIfFunctionBlocker::
|
||||||
ScopeEnded(cmMakefile &mf)
|
ScopeEnded(cmMakefile &mf)
|
||||||
{
|
{
|
||||||
|
const char* versionValue
|
||||||
|
= mf.GetDefinition("CMAKE_MINIMUM_REQUIRED_VERSION");
|
||||||
|
if (!versionValue || (atof(versionValue) <= 1.4))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
std::string errmsg = "The end of a CMakeLists file was reached with an IF statement that was not closed properly.\nWithin the directory: ";
|
std::string errmsg = "The end of a CMakeLists file was reached with an IF statement that was not closed properly.\nWithin the directory: ";
|
||||||
errmsg += mf.GetCurrentDirectory();
|
errmsg += mf.GetCurrentDirectory();
|
||||||
errmsg += "\nThe arguments are: ";
|
errmsg += "\nThe arguments are: ";
|
||||||
|
|
Loading…
Reference in New Issue