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/cmSetDirectoryPropertiesCommand.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/cmSetDirectoryPropertiesCommand.cxx')
-rw-r--r-- | Source/cmSetDirectoryPropertiesCommand.cxx | 56 |
1 files changed, 21 insertions, 35 deletions
diff --git a/Source/cmSetDirectoryPropertiesCommand.cxx b/Source/cmSetDirectoryPropertiesCommand.cxx index 3d4b7a9..ca758da 100644 --- a/Source/cmSetDirectoryPropertiesCommand.cxx +++ b/Source/cmSetDirectoryPropertiesCommand.cxx @@ -14,57 +14,43 @@ #include "cmake.h" // cmSetDirectoryPropertiesCommand -bool cmSetDirectoryPropertiesCommand -::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) +bool cmSetDirectoryPropertiesCommand::InitialPass( + std::vector<std::string> const& args, cmExecutionStatus&) { - if(args.size() < 1 ) - { + if (args.size() < 1) { this->SetError("called with incorrect number of arguments"); return false; - } + } std::string errors; - bool ret = - cmSetDirectoryPropertiesCommand::RunCommand(this->Makefile, - args.begin() + 1, - args.end(), errors); - if (!ret) - { + bool ret = cmSetDirectoryPropertiesCommand::RunCommand( + this->Makefile, args.begin() + 1, args.end(), errors); + if (!ret) { this->SetError(errors); - } + } return ret; } -bool cmSetDirectoryPropertiesCommand -::RunCommand(cmMakefile *mf, - std::vector<std::string>::const_iterator ait, - std::vector<std::string>::const_iterator aitend, - std::string &errors) +bool cmSetDirectoryPropertiesCommand::RunCommand( + cmMakefile* mf, std::vector<std::string>::const_iterator ait, + std::vector<std::string>::const_iterator aitend, std::string& errors) { - for (; ait != aitend; ait += 2 ) - { - if ( ait +1 == aitend) - { + for (; ait != aitend; ait += 2) { + if (ait + 1 == aitend) { errors = "Wrong number of arguments"; return false; - } + } const std::string& prop = *ait; - const std::string& value = *(ait+1); - if ( prop == "VARIABLES" ) - { - errors = - "Variables and cache variables should be set using SET command"; + const std::string& value = *(ait + 1); + if (prop == "VARIABLES") { + errors = "Variables and cache variables should be set using SET command"; return false; - } - else if ( prop == "MACROS" ) - { - errors = - "Commands and macros cannot be set using SET_CMAKE_PROPERTIES"; + } else if (prop == "MACROS") { + errors = "Commands and macros cannot be set using SET_CMAKE_PROPERTIES"; return false; - } - mf->SetProperty(prop, value.c_str()); } + mf->SetProperty(prop, value.c_str()); + } return true; } - |