diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 14:34:04 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 20:05:19 (GMT) |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Source/cmCMakePolicyCommand.cxx | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | CMake-d9fd2f5402eeaa345691313658e02b51038f570b.zip CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.bz2 |
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/cmCMakePolicyCommand.cxx')
-rw-r--r-- | Source/cmCMakePolicyCommand.cxx | 130 |
1 files changed, 51 insertions, 79 deletions
diff --git a/Source/cmCMakePolicyCommand.cxx b/Source/cmCMakePolicyCommand.cxx index 9132aec..07e0885 100644 --- a/Source/cmCMakePolicyCommand.cxx +++ b/Source/cmCMakePolicyCommand.cxx @@ -14,47 +14,35 @@ #include "cmVersion.h" // cmCMakePolicyCommand -bool cmCMakePolicyCommand -::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) +bool cmCMakePolicyCommand::InitialPass(std::vector<std::string> const& args, + cmExecutionStatus&) { - if(args.size() < 1) - { + if (args.size() < 1) { this->SetError("requires at least one argument."); return false; - } + } - if(args[0] == "SET") - { + if (args[0] == "SET") { return this->HandleSetMode(args); - } - else if(args[0] == "GET") - { + } else if (args[0] == "GET") { return this->HandleGetMode(args); - } - else if(args[0] == "PUSH") - { - if(args.size() > 1) - { + } else if (args[0] == "PUSH") { + if (args.size() > 1) { this->SetError("PUSH may not be given additional arguments."); return false; - } + } this->Makefile->PushPolicy(); return true; - } - else if(args[0] == "POP") - { - if(args.size() > 1) - { + } else if (args[0] == "POP") { + if (args.size() > 1) { this->SetError("POP may not be given additional arguments."); return false; - } + } this->Makefile->PopPolicy(); return true; - } - else if(args[0] == "VERSION") - { + } else if (args[0] == "VERSION") { return this->HandleVersionMode(args); - } + } std::ostringstream e; e << "given unknown first argument \"" << args[0] << "\""; @@ -64,60 +52,50 @@ bool cmCMakePolicyCommand bool cmCMakePolicyCommand::HandleSetMode(std::vector<std::string> const& args) { - if(args.size() != 3) - { + if (args.size() != 3) { this->SetError("SET must be given exactly 2 additional arguments."); return false; - } + } cmPolicies::PolicyStatus status; - if(args[2] == "OLD") - { + if (args[2] == "OLD") { status = cmPolicies::OLD; - } - else if(args[2] == "NEW") - { + } else if (args[2] == "NEW") { status = cmPolicies::NEW; - } - else - { + } else { std::ostringstream e; e << "SET given unrecognized policy status \"" << args[2] << "\""; this->SetError(e.str()); return false; - } + } - if(!this->Makefile->SetPolicy(args[1].c_str(), status)) - { + if (!this->Makefile->SetPolicy(args[1].c_str(), status)) { this->SetError("SET failed to set policy."); return false; - } - if(args[1] == "CMP0001" && - (status == cmPolicies::WARN || status == cmPolicies::OLD)) - { - if(!(this->Makefile->GetState() - ->GetInitializedCacheValue("CMAKE_BACKWARDS_COMPATIBILITY"))) - { + } + if (args[1] == "CMP0001" && + (status == cmPolicies::WARN || status == cmPolicies::OLD)) { + if (!(this->Makefile->GetState()->GetInitializedCacheValue( + "CMAKE_BACKWARDS_COMPATIBILITY"))) { // Set it to 2.4 because that is the last version where the // variable had meaning. - this->Makefile->AddCacheDefinition - ("CMAKE_BACKWARDS_COMPATIBILITY", "2.4", - "For backwards compatibility, what version of CMake " - "commands and " - "syntax should this version of CMake try to support.", - cmState::STRING); - } - } + this->Makefile->AddCacheDefinition( + "CMAKE_BACKWARDS_COMPATIBILITY", "2.4", + "For backwards compatibility, what version of CMake " + "commands and " + "syntax should this version of CMake try to support.", + cmState::STRING); + } + } return true; } bool cmCMakePolicyCommand::HandleGetMode(std::vector<std::string> const& args) { - if(args.size() != 3) - { + if (args.size() != 3) { this->SetError("GET must be given exactly 2 additional arguments."); return false; - } + } // Get arguments. std::string const& id = args[1]; @@ -125,19 +103,17 @@ bool cmCMakePolicyCommand::HandleGetMode(std::vector<std::string> const& args) // Lookup the policy number. cmPolicies::PolicyID pid; - if(!cmPolicies::GetPolicyID(id.c_str(), pid)) - { + if (!cmPolicies::GetPolicyID(id.c_str(), pid)) { std::ostringstream e; e << "GET given policy \"" << id << "\" which is not known to this " << "version of CMake."; this->SetError(e.str()); return false; - } + } // Lookup the policy setting. cmPolicies::PolicyStatus status = this->Makefile->GetPolicyStatus(pid); - switch (status) - { + switch (status) { case cmPolicies::OLD: // Report that the policy is set to OLD. this->Makefile->AddDefinition(var, "OLD"); @@ -154,32 +130,28 @@ bool cmCMakePolicyCommand::HandleGetMode(std::vector<std::string> const& args) case cmPolicies::REQUIRED_ALWAYS: // The policy is required to be set before anything needs it. { - std::ostringstream e; - e << cmPolicies::GetRequiredPolicyError(pid) - << "\n" - << "The call to cmake_policy(GET " << id << " ...) at which this " - << "error appears requests the policy, and this version of CMake " - << "requires that the policy be set to NEW before it is checked."; - this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str()); + std::ostringstream e; + e << cmPolicies::GetRequiredPolicyError(pid) << "\n" + << "The call to cmake_policy(GET " << id << " ...) at which this " + << "error appears requests the policy, and this version of CMake " + << "requires that the policy be set to NEW before it is checked."; + this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str()); } - } + } return true; } -bool -cmCMakePolicyCommand::HandleVersionMode(std::vector<std::string> const& args) +bool cmCMakePolicyCommand::HandleVersionMode( + std::vector<std::string> const& args) { - if(args.size() <= 1) - { + if (args.size() <= 1) { this->SetError("VERSION not given an argument"); return false; - } - else if(args.size() >= 3) - { + } else if (args.size() >= 3) { this->SetError("VERSION given too many arguments"); return false; - } + } this->Makefile->SetPolicyVersion(args[1].c_str()); return true; } |