diff options
author | Brad King <brad.king@kitware.com> | 2008-03-04 23:42:06 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2008-03-04 23:42:06 (GMT) |
commit | 2f922c6220704490912ce78a7dc5c8e07532b582 (patch) | |
tree | 1b9554393070c9769627f16c7e34864c4e49e44b /Source/cmCMakeMinimumRequired.cxx | |
parent | 53e0ed3273c1a4a8f304f482220a474c3bc0e689 (diff) | |
download | CMake-2f922c6220704490912ce78a7dc5c8e07532b582.zip CMake-2f922c6220704490912ce78a7dc5c8e07532b582.tar.gz CMake-2f922c6220704490912ce78a7dc5c8e07532b582.tar.bz2 |
ENH: Make CMAKE_MINIMUM_REQUIRED command FATAL_ERROR option implicit (always on). Accept but ignore the existing option.
Diffstat (limited to 'Source/cmCMakeMinimumRequired.cxx')
-rw-r--r-- | Source/cmCMakeMinimumRequired.cxx | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/Source/cmCMakeMinimumRequired.cxx b/Source/cmCMakeMinimumRequired.cxx index f20c06b..8d4aaf9 100644 --- a/Source/cmCMakeMinimumRequired.cxx +++ b/Source/cmCMakeMinimumRequired.cxx @@ -25,7 +25,6 @@ bool cmCMakeMinimumRequired // Process arguments. std::string version_string; bool doing_version = false; - bool fatal_error = false; for(unsigned int i=0; i < args.size(); ++i) { if(args[i] == "VERSION") @@ -40,7 +39,6 @@ bool cmCMakeMinimumRequired return false; } doing_version = false; - fatal_error = true; } else if(doing_version) { @@ -101,24 +99,13 @@ bool cmCMakeMinimumRequired { // The current version is too low. cmOStringStream e; - if(!fatal_error) - { - e << "WARNING: "; - } e << "This project requires version " << version_string.c_str() << " of CMake. " << "You are running version " << current_major << "." << current_minor << "." << current_patch << ".\n"; - if(fatal_error) - { - cmSystemTools::Error(e.str().c_str()); - cmSystemTools::SetFatalErrorOccured(); - } - else - { - cmSystemTools::Message(e.str().c_str()); - } + cmSystemTools::Error(e.str().c_str()); + cmSystemTools::SetFatalErrorOccured(); } // set the policy version as well |