|
@@ -82,13 +82,6 @@ bool cmIfFunctionBlocker::ShouldRemove(const cmListFileFunction& lff,
|
|
|
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: ";
|
|
@@ -100,7 +93,7 @@ ScopeEnded(cmMakefile &mf)
|
|
|
errmsg += (j->Quoted?"\"":"");
|
|
errmsg += (j->Quoted?"\"":"");
|
|
|
errmsg += " ";
|
|
errmsg += " ";
|
|
|
}
|
|
}
|
|
|
- cmSystemTools::Error(errmsg.c_str());
|
|
|
|
|
|
|
+ cmSystemTools::Message(errmsg.c_str(), "Warning");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
bool cmIfCommand::InvokeInitialPass(const std::vector<cmListFileArgument>& args)
|
|
bool cmIfCommand::InvokeInitialPass(const std::vector<cmListFileArgument>& args)
|