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/cmExternalMakefileProjectGenerator.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/cmExternalMakefileProjectGenerator.cxx')
-rw-r--r-- | Source/cmExternalMakefileProjectGenerator.cxx | 46 |
1 files changed, 18 insertions, 28 deletions
diff --git a/Source/cmExternalMakefileProjectGenerator.cxx b/Source/cmExternalMakefileProjectGenerator.cxx index cdf0292..e3c8fa4 100644 --- a/Source/cmExternalMakefileProjectGenerator.cxx +++ b/Source/cmExternalMakefileProjectGenerator.cxx @@ -14,58 +14,48 @@ #include <assert.h> -void cmExternalMakefileProjectGenerator -::EnableLanguage(std::vector<std::string> const&, - cmMakefile *, bool) +void cmExternalMakefileProjectGenerator::EnableLanguage( + std::vector<std::string> const&, cmMakefile*, bool) { } std::string cmExternalMakefileProjectGenerator::CreateFullGeneratorName( - const std::string& globalGenerator, - const std::string& extraGenerator) + const std::string& globalGenerator, const std::string& extraGenerator) { std::string fullName; - if (!globalGenerator.empty()) - { - if (!extraGenerator.empty()) - { + if (!globalGenerator.empty()) { + if (!extraGenerator.empty()) { fullName = extraGenerator; fullName += " - "; - } - fullName += globalGenerator; } + fullName += globalGenerator; + } return fullName; } std::string cmExternalMakefileProjectGenerator::GetGlobalGeneratorName( - const std::string& fullName) + const std::string& fullName) { // at least one global generator must be supported assert(!this->SupportedGlobalGenerators.empty()); - if (fullName.empty()) - { + if (fullName.empty()) { return ""; - } + } std::string currentName = fullName; // if we get only the short name, take the first global generator as default - if (currentName == this->GetName()) - { + if (currentName == this->GetName()) { return this->SupportedGlobalGenerators[0]; - } + } // otherwise search for the matching global generator - for (std::vector<std::string>::const_iterator - it = this->SupportedGlobalGenerators.begin(); - it != this->SupportedGlobalGenerators.end(); - ++it) - { - if (this->CreateFullGeneratorName(*it, this->GetName()) - == currentName) - { - return *it; - } + for (std::vector<std::string>::const_iterator it = + this->SupportedGlobalGenerators.begin(); + it != this->SupportedGlobalGenerators.end(); ++it) { + if (this->CreateFullGeneratorName(*it, this->GetName()) == currentName) { + return *it; } + } return ""; } |