Commit 2f922c62 authored by Brad King's avatar Brad King
Browse files

ENH: Make CMAKE_MINIMUM_REQUIRED command FATAL_ERROR option implicit (always...

ENH: Make CMAKE_MINIMUM_REQUIRED command FATAL_ERROR option implicit (always on).  Accept but ignore the existing option.
parent 53e0ed32
...@@ -25,7 +25,6 @@ bool cmCMakeMinimumRequired ...@@ -25,7 +25,6 @@ bool cmCMakeMinimumRequired
// Process arguments. // Process arguments.
std::string version_string; std::string version_string;
bool doing_version = false; bool doing_version = false;
bool fatal_error = false;
for(unsigned int i=0; i < args.size(); ++i) for(unsigned int i=0; i < args.size(); ++i)
{ {
if(args[i] == "VERSION") if(args[i] == "VERSION")
...@@ -40,7 +39,6 @@ bool cmCMakeMinimumRequired ...@@ -40,7 +39,6 @@ bool cmCMakeMinimumRequired
return false; return false;
} }
doing_version = false; doing_version = false;
fatal_error = true;
} }
else if(doing_version) else if(doing_version)
{ {
...@@ -101,24 +99,13 @@ bool cmCMakeMinimumRequired ...@@ -101,24 +99,13 @@ bool cmCMakeMinimumRequired
{ {
// The current version is too low. // The current version is too low.
cmOStringStream e; cmOStringStream e;
if(!fatal_error)
{
e << "WARNING: ";
}
e << "This project requires version " << version_string.c_str() e << "This project requires version " << version_string.c_str()
<< " of CMake. " << " of CMake. "
<< "You are running version " << "You are running version "
<< current_major << "." << current_minor << "." << current_patch << current_major << "." << current_minor << "." << current_patch
<< ".\n"; << ".\n";
if(fatal_error) cmSystemTools::Error(e.str().c_str());
{ cmSystemTools::SetFatalErrorOccured();
cmSystemTools::Error(e.str().c_str());
cmSystemTools::SetFatalErrorOccured();
}
else
{
cmSystemTools::Message(e.str().c_str());
}
} }
// set the policy version as well // set the policy version as well
......
...@@ -66,12 +66,13 @@ public: ...@@ -66,12 +66,13 @@ public:
virtual const char* GetFullDocumentation() virtual const char* GetFullDocumentation()
{ {
return return
" cmake_minimum_required(VERSION versionNumber [FATAL_ERROR])\n" " cmake_minimum_required(VERSION major[.minor[.patch]]\n"
"Let cmake know that the project requires a certain version of a " " [FATAL_ERROR])\n"
"cmake, or newer. CMake will also try to be backwards compatible to " "If the current version of CMake is lower than that required "
"the version of cmake specified, if a newer version of cmake is " "it will stop processing the project and report an error.\n"
"running. If FATAL_ERROR is given then failure to meet the " "The FATAL_ERROR option is accepted but ignored. It is left from "
"requirements will be considered an error instead of a warning."; "CMake versions 2.4 and lower in which failure to meet the minimum "
"version was a warning by default.";
} }
cmTypeMacro(cmCMakeMinimumRequired, cmCommand); cmTypeMacro(cmCMakeMinimumRequired, cmCommand);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment