diff options
| author | Kitware Robot <kwrobot@kitware.com> | 2018-06-01 13:53:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-06-01 13:53:42 (GMT) |
| commit | d7204e649ed4ebb19bb341b4e49eb51514364922 (patch) | |
| tree | d9ac3ded5ae6899be7188795011743fe3e6da0a6 /Source/cmGlobalUnixMakefileGenerator3.cxx | |
| parent | 12fed3edb107c949671043196fa94c542b45452a (diff) | |
| download | CMake-d7204e649ed4ebb19bb341b4e49eb51514364922.zip CMake-d7204e649ed4ebb19bb341b4e49eb51514364922.tar.gz CMake-d7204e649ed4ebb19bb341b4e49eb51514364922.tar.bz2 | |
Revise C++ coding style using clang-format-6.0
Run the `clang-format.bash` script to update all our C and C++ code to a
new style defined by `.clang-format`. Use `clang-format` version 6.0.
* 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/cmGlobalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 641b760..61c42be 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -640,12 +640,13 @@ void cmGlobalUnixMakefileGenerator3::WriteConvenienceRules2( for (cmGeneratorTarget* gtarget : targets) { int type = gtarget->GetType(); std::string name = gtarget->GetName(); - if (!name.empty() && ((type == cmStateEnums::EXECUTABLE) || - (type == cmStateEnums::STATIC_LIBRARY) || - (type == cmStateEnums::SHARED_LIBRARY) || - (type == cmStateEnums::MODULE_LIBRARY) || - (type == cmStateEnums::OBJECT_LIBRARY) || - (type == cmStateEnums::UTILITY))) { + if (!name.empty() && + ((type == cmStateEnums::EXECUTABLE) || + (type == cmStateEnums::STATIC_LIBRARY) || + (type == cmStateEnums::SHARED_LIBRARY) || + (type == cmStateEnums::MODULE_LIBRARY) || + (type == cmStateEnums::OBJECT_LIBRARY) || + (type == cmStateEnums::UTILITY))) { std::string makefileName; // Add a rule to build the target by name. localName = lg->GetRelativeTargetDirectory(gtarget); @@ -920,8 +921,9 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule( std::string path; std::vector<std::string> no_depends; std::vector<std::string> commands; - lg->AppendEcho(commands, "The following are some of the valid targets " - "for this Makefile:"); + lg->AppendEcho(commands, + "The following are some of the valid targets " + "for this Makefile:"); lg->AppendEcho(commands, "... all (the default if no target is provided)"); lg->AppendEcho(commands, "... clean"); if (!this->GlobalSettingIsOn("CMAKE_SUPPRESS_REGENERATION")) { |