mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-05 22:00:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revise C++ coding style using clang-format

Browse Source 
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.
This commit is contained in:
Kitware Robot
2016-05-16 10:34:04 -04:00
committed by Brad King
parent 82df6deaaf
commit d9fd2f5402
1450 changed files with 62404 additions and 83728 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmCMakePolicyCommand.cxx
+50 -78
View File
@@ -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;
}