diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 10:34:04 -0400 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 16:05:19 -0400 |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Source/cmCMakeMinimumRequired.cxx | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | cmake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz |
Revise C++ coding style using clang-format
Run the `Utilities/Scripts/clang-format.bash` script to update
all our C++ code to a new style defined by `.clang-format`.
Use `clang-format` version 3.8.
* If you reached this commit for a line in `git blame`, re-run the blame
operation starting at the parent of this commit to see older history
for the content.
* See the parent commit for instructions to rebase a change across this
style transition commit.
Diffstat (limited to 'Source/cmCMakeMinimumRequired.cxx')
-rw-r--r-- | Source/cmCMakeMinimumRequired.cxx | 88 |
1 files changed, 32 insertions, 56 deletions
diff --git a/Source/cmCMakeMinimumRequired.cxx b/Source/cmCMakeMinimumRequired.cxx index eac5965ec2..1376845073 100644 --- a/Source/cmCMakeMinimumRequired.cxx +++ b/Source/cmCMakeMinimumRequired.cxx @@ -14,54 +14,42 @@ #include "cmVersion.h" // cmCMakeMinimumRequired -bool cmCMakeMinimumRequired -::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) +bool cmCMakeMinimumRequired::InitialPass(std::vector<std::string> const& args, + cmExecutionStatus&) { // Process arguments. std::string version_string; bool doing_version = false; - for(unsigned int i=0; i < args.size(); ++i) - { - if(args[i] == "VERSION") - { + for (unsigned int i = 0; i < args.size(); ++i) { + if (args[i] == "VERSION") { doing_version = true; - } - else if(args[i] == "FATAL_ERROR") - { - if(doing_version) - { + } else if (args[i] == "FATAL_ERROR") { + if (doing_version) { this->SetError("called with no value for VERSION."); return false; - } - doing_version = false; } - else if(doing_version) - { + doing_version = false; + } else if (doing_version) { doing_version = false; version_string = args[i]; - } - else - { + } else { this->UnknownArguments.push_back(args[i]); - } } - if(doing_version) - { + } + if (doing_version) { this->SetError("called with no value for VERSION."); return false; - } + } // Make sure there was a version to check. - if(version_string.empty()) - { + if (version_string.empty()) { return this->EnforceUnknownArguments(); - } + } // Save the required version string. this->Makefile->AddDefinition("CMAKE_MINIMUM_REQUIRED_VERSION", version_string.c_str()); - // Get the current version number. unsigned int current_major = cmVersion::GetMajorVersion(); unsigned int current_minor = cmVersion::GetMinorVersion(); @@ -74,28 +62,21 @@ bool cmCMakeMinimumRequired unsigned int required_minor = 0; unsigned int required_patch = 0; unsigned int required_tweak = 0; - if(sscanf(version_string.c_str(), "%u.%u.%u.%u", - &required_major, &required_minor, - &required_patch, &required_tweak) < 2) - { + if (sscanf(version_string.c_str(), "%u.%u.%u.%u", &required_major, + &required_minor, &required_patch, &required_tweak) < 2) { std::ostringstream e; e << "could not parse VERSION \"" << version_string << "\"."; this->SetError(e.str()); return false; - } + } // Compare the version numbers. - if((current_major < required_major) || - (current_major == required_major && - current_minor < required_minor) || - (current_major == required_major && - current_minor == required_minor && - current_patch < required_patch) || - (current_major == required_major && - current_minor == required_minor && - current_patch == required_patch && - current_tweak < required_tweak)) - { + if ((current_major < required_major) || + (current_major == required_major && current_minor < required_minor) || + (current_major == required_major && current_minor == required_minor && + current_patch < required_patch) || + (current_major == required_major && current_minor == required_minor && + current_patch == required_patch && current_tweak < required_tweak)) { // The current version is too low. std::ostringstream e; e << "CMake " << version_string @@ -104,23 +85,19 @@ bool cmCMakeMinimumRequired this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str()); cmSystemTools::SetFatalErrorOccured(); return true; - } + } // The version is not from the future, so enforce unknown arguments. - if(!this->EnforceUnknownArguments()) - { + if (!this->EnforceUnknownArguments()) { return false; - } + } - if (required_major < 2 || (required_major == 2 && required_minor < 4)) - { + if (required_major < 2 || (required_major == 2 && required_minor < 4)) { this->Makefile->IssueMessage( cmake::AUTHOR_WARNING, "Compatibility with CMake < 2.4 is not supported by CMake >= 3.0."); this->Makefile->SetPolicyVersion("2.4"); - } - else - { + } else { this->Makefile->SetPolicyVersion(version_string.c_str()); } @@ -129,13 +106,12 @@ bool cmCMakeMinimumRequired bool cmCMakeMinimumRequired::EnforceUnknownArguments() { - if(!this->UnknownArguments.empty()) - { + if (!this->UnknownArguments.empty()) { std::ostringstream e; - e << "called with unknown argument \"" - << this->UnknownArguments[0] << "\"."; + e << "called with unknown argument \"" << this->UnknownArguments[0] + << "\"."; this->SetError(e.str()); return false; - } + } return true; } |