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/cmInstallTargetsCommand.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/cmInstallTargetsCommand.cxx')
-rw-r--r-- | Source/cmInstallTargetsCommand.cxx | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/Source/cmInstallTargetsCommand.cxx b/Source/cmInstallTargetsCommand.cxx index 7e7b848..056ea24 100644 --- a/Source/cmInstallTargetsCommand.cxx +++ b/Source/cmInstallTargetsCommand.cxx @@ -12,54 +12,44 @@ #include "cmInstallTargetsCommand.h" // cmExecutableCommand -bool cmInstallTargetsCommand -::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) +bool cmInstallTargetsCommand::InitialPass(std::vector<std::string> const& args, + cmExecutionStatus&) { - if(args.size() < 2 ) - { + if (args.size() < 2) { this->SetError("called with incorrect number of arguments"); return false; - } + } // Enable the install target. this->Makefile->GetGlobalGenerator()->EnableInstallTarget(); - cmTargets &tgts = this->Makefile->GetTargets(); + cmTargets& tgts = this->Makefile->GetTargets(); std::vector<std::string>::const_iterator s = args.begin(); ++s; std::string runtime_dir = "/bin"; - for (;s != args.end(); ++s) - { - if (*s == "RUNTIME_DIRECTORY") - { + for (; s != args.end(); ++s) { + if (*s == "RUNTIME_DIRECTORY") { ++s; - if ( s == args.end() ) - { + if (s == args.end()) { this->SetError("called with RUNTIME_DIRECTORY but no actual " "directory"); return false; - } + } runtime_dir = *s; - } - else if (tgts.find(*s) != tgts.end()) - { + } else if (tgts.find(*s) != tgts.end()) { tgts[*s].SetInstallPath(args[0].c_str()); tgts[*s].SetRuntimeInstallPath(runtime_dir.c_str()); tgts[*s].SetHaveInstallRule(true); - } - else - { + } else { std::string str = "Cannot find target: \"" + *s + "\" to install."; this->SetError(str); return false; - } } + } - this->Makefile->GetGlobalGenerator() - ->AddInstallComponent(this->Makefile->GetSafeDefinition( - "CMAKE_INSTALL_DEFAULT_COMPONENT_NAME")); + this->Makefile->GetGlobalGenerator()->AddInstallComponent( + this->Makefile->GetSafeDefinition("CMAKE_INSTALL_DEFAULT_COMPONENT_NAME")); return true; } - |