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/cmVariableRequiresCommand.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/cmVariableRequiresCommand.cxx')
-rw-r--r-- | Source/cmVariableRequiresCommand.cxx | 54 |
1 files changed, 24 insertions, 30 deletions
diff --git a/Source/cmVariableRequiresCommand.cxx b/Source/cmVariableRequiresCommand.cxx index a830842..8d55b0e 100644 --- a/Source/cmVariableRequiresCommand.cxx +++ b/Source/cmVariableRequiresCommand.cxx @@ -14,67 +14,61 @@ #include "cmState.h" // cmLibraryCommand -bool cmVariableRequiresCommand -::InitialPass(std::vector<std::string>const& args, cmExecutionStatus &) +bool cmVariableRequiresCommand::InitialPass( + std::vector<std::string> const& args, cmExecutionStatus&) { - if(this->Disallowed(cmPolicies::CMP0035, - "The variable_requires command should not be called; see CMP0035.")) - { return true; } - if(args.size() < 3 ) - { + if (this->Disallowed( + cmPolicies::CMP0035, + "The variable_requires command should not be called; see CMP0035.")) { + return true; + } + if (args.size() < 3) { this->SetError("called with incorrect number of arguments"); return false; - } + } std::string testVariable = args[0]; - if(!this->Makefile->IsOn(testVariable)) - { + if (!this->Makefile->IsOn(testVariable)) { return true; - } + } std::string resultVariable = args[1]; bool requirementsMet = true; std::string notSet; bool hasAdvanced = false; cmState* state = this->Makefile->GetState(); - for(unsigned int i = 2; i < args.size(); ++i) - { - if(!this->Makefile->IsOn(args[i])) - { + for (unsigned int i = 2; i < args.size(); ++i) { + if (!this->Makefile->IsOn(args[i])) { requirementsMet = false; notSet += args[i]; notSet += "\n"; - if(state->GetCacheEntryValue(args[i]) && - state->GetCacheEntryPropertyAsBool(args[i], "ADVANCED")) - { + if (state->GetCacheEntryValue(args[i]) && + state->GetCacheEntryPropertyAsBool(args[i], "ADVANCED")) { hasAdvanced = true; - } } } + } const char* reqVar = this->Makefile->GetDefinition(resultVariable); // if reqVar is unset, then set it to requirementsMet // if reqVar is set to true, but requirementsMet is false , then // set reqVar to false. - if(!reqVar || (!requirementsMet && this->Makefile->IsOn(reqVar))) - { + if (!reqVar || (!requirementsMet && this->Makefile->IsOn(reqVar))) { this->Makefile->AddDefinition(resultVariable, requirementsMet); - } + } - if(!requirementsMet) - { + if (!requirementsMet) { std::string message = "Variable assertion failed:\n"; - message += testVariable + - " Requires that the following unset variables are set:\n"; + message += + testVariable + " Requires that the following unset variables are set:\n"; message += notSet; message += "\nPlease set them, or set "; message += testVariable + " to false, and re-configure.\n"; - if(hasAdvanced) - { + if (hasAdvanced) { message += "One or more of the required variables is advanced." " To set the variable, you must turn on advanced mode in cmake."; - } - cmSystemTools::Error(message.c_str()); } + cmSystemTools::Error(message.c_str()); + } return true; } |