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/cmInstallDirectoryGenerator.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/cmInstallDirectoryGenerator.cxx')
-rw-r--r-- | Source/cmInstallDirectoryGenerator.cxx | 101 |
1 files changed, 40 insertions, 61 deletions
diff --git a/Source/cmInstallDirectoryGenerator.cxx b/Source/cmInstallDirectoryGenerator.cxx index 99141df..671ab4c 100644 --- a/Source/cmInstallDirectoryGenerator.cxx +++ b/Source/cmInstallDirectoryGenerator.cxx @@ -14,43 +14,36 @@ #include "cmGeneratorExpression.h" #include "cmLocalGenerator.h" -cmInstallDirectoryGenerator -::cmInstallDirectoryGenerator(std::vector<std::string> const& dirs, - const char* dest, - const char* file_permissions, - const char* dir_permissions, - std::vector<std::string> const& configurations, - const char* component, - MessageLevel message, - bool exclude_from_all, - const char* literal_args, - bool optional): - cmInstallGenerator(dest, configurations, component, message, - exclude_from_all), - LocalGenerator(0), - Directories(dirs), - FilePermissions(file_permissions), DirPermissions(dir_permissions), - LiteralArguments(literal_args), Optional(optional) +cmInstallDirectoryGenerator::cmInstallDirectoryGenerator( + std::vector<std::string> const& dirs, const char* dest, + const char* file_permissions, const char* dir_permissions, + std::vector<std::string> const& configurations, const char* component, + MessageLevel message, bool exclude_from_all, const char* literal_args, + bool optional) + : cmInstallGenerator(dest, configurations, component, message, + exclude_from_all) + , LocalGenerator(0) + , Directories(dirs) + , FilePermissions(file_permissions) + , DirPermissions(dir_permissions) + , LiteralArguments(literal_args) + , Optional(optional) { // We need per-config actions if destination have generator expressions. - if(cmGeneratorExpression::Find(Destination) != std::string::npos) - { + if (cmGeneratorExpression::Find(Destination) != std::string::npos) { this->ActionsPerConfig = true; - } + } // We need per-config actions if any directories have generator expressions. - for(std::vector<std::string>::const_iterator i = dirs.begin(); - !this->ActionsPerConfig && i != dirs.end(); ++i) - { - if(cmGeneratorExpression::Find(*i) != std::string::npos) - { + for (std::vector<std::string>::const_iterator i = dirs.begin(); + !this->ActionsPerConfig && i != dirs.end(); ++i) { + if (cmGeneratorExpression::Find(*i) != std::string::npos) { this->ActionsPerConfig = true; - } } + } } -cmInstallDirectoryGenerator -::~cmInstallDirectoryGenerator() +cmInstallDirectoryGenerator::~cmInstallDirectoryGenerator() { } @@ -59,60 +52,46 @@ void cmInstallDirectoryGenerator::Compute(cmLocalGenerator* lg) LocalGenerator = lg; } -void -cmInstallDirectoryGenerator::GenerateScriptActions(std::ostream& os, - Indent const& indent) +void cmInstallDirectoryGenerator::GenerateScriptActions(std::ostream& os, + Indent const& indent) { - if(this->ActionsPerConfig) - { + if (this->ActionsPerConfig) { this->cmInstallGenerator::GenerateScriptActions(os, indent); - } - else - { + } else { this->AddDirectoryInstallRule(os, "", indent, this->Directories); - } + } } void cmInstallDirectoryGenerator::GenerateScriptForConfig( - std::ostream& os, - const std::string& config, - Indent const& indent) + std::ostream& os, const std::string& config, Indent const& indent) { std::vector<std::string> dirs; cmGeneratorExpression ge; - for(std::vector<std::string>::const_iterator i = this->Directories.begin(); - i != this->Directories.end(); ++i) - { + for (std::vector<std::string>::const_iterator i = this->Directories.begin(); + i != this->Directories.end(); ++i) { cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(*i); - cmSystemTools::ExpandListArgument(cge->Evaluate( - this->LocalGenerator, config), dirs); - } + cmSystemTools::ExpandListArgument( + cge->Evaluate(this->LocalGenerator, config), dirs); + } this->AddDirectoryInstallRule(os, config, indent, dirs); } void cmInstallDirectoryGenerator::AddDirectoryInstallRule( - std::ostream& os, - const std::string& config, - Indent const& indent, + std::ostream& os, const std::string& config, Indent const& indent, std::vector<std::string> const& dirs) { // Write code to install the directories. const char* no_rename = 0; - this->AddInstallRule(os, - this->GetDestination(config), - cmInstallType_DIRECTORY, - dirs, - this->Optional, + this->AddInstallRule(os, this->GetDestination(config), + cmInstallType_DIRECTORY, dirs, this->Optional, this->FilePermissions.c_str(), - this->DirPermissions.c_str(), - no_rename, this->LiteralArguments.c_str(), - indent); + this->DirPermissions.c_str(), no_rename, + this->LiteralArguments.c_str(), indent); } -std::string -cmInstallDirectoryGenerator::GetDestination(std::string const& config) const +std::string cmInstallDirectoryGenerator::GetDestination( + std::string const& config) const { cmGeneratorExpression ge; - return ge.Parse(this->Destination) - ->Evaluate(this->LocalGenerator, config); + return ge.Parse(this->Destination)->Evaluate(this->LocalGenerator, config); } |