diff options
| author | Brad King <brad.king@kitware.com> | 2016-05-09 13:01:08 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-05-09 13:01:08 (GMT) |
| commit | 7ecd9648a166ecf500badfd0c4eab77a15101c35 (patch) | |
| tree | 29dba5c66e0b210f846e64b64f2af21e8fcddc1e /Source/cmMakefileTargetGenerator.cxx | |
| parent | 488b82f8ccca4de8a052b94ddf2be131682561cb (diff) | |
| parent | afca373510b5303d55fde17085718323ea9b2cb9 (diff) | |
| download | CMake-7ecd9648a166ecf500badfd0c4eab77a15101c35.zip CMake-7ecd9648a166ecf500badfd0c4eab77a15101c35.tar.gz CMake-7ecd9648a166ecf500badfd0c4eab77a15101c35.tar.bz2 | |
Merge topic 'clang-format-prep'
afca3735 Help clang-format wrap after braces on long initializer lists
85425a3e Move comments off of class access specifier lines
64b55203 Isolate formatted streaming blocks with clang-format off/on
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index e14f828..50449fb 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -1057,10 +1057,12 @@ void cmMakefileTargetGenerator::WriteTargetDependRules() // Store multiple output pairs in the depend info file. if(!this->MultipleOutputPairs.empty()) { + /* clang-format off */ *this->InfoFileStream << "\n" << "# Pairs of files generated by the same build rule.\n" << "set(CMAKE_MULTIPLE_OUTPUT_PAIRS\n"; + /* clang-format on */ for(MultipleOutputPairsType::const_iterator pi = this->MultipleOutputPairs.begin(); pi != this->MultipleOutputPairs.end(); ++pi) @@ -1075,10 +1077,12 @@ void cmMakefileTargetGenerator::WriteTargetDependRules() // Store list of targets linked directly or transitively. { + /* clang-format off */ *this->InfoFileStream << "\n" << "# Targets to which this target links.\n" << "set(CMAKE_TARGET_LINKED_INFO_FILES\n"; + /* clang-format on */ std::vector<std::string> dirs = this->GetLinkedTargetDirectories(); for (std::vector<std::string>::iterator i = dirs.begin(); i != dirs.end(); ++i) @@ -1089,11 +1093,13 @@ void cmMakefileTargetGenerator::WriteTargetDependRules() << " )\n"; } + /* clang-format off */ *this->InfoFileStream << "\n" << "# Fortran module output directory.\n" << "set(CMAKE_Fortran_TARGET_MODULE_DIR \"" << this->GetFortranModuleDirectory() << "\")\n"; + /* clang-format on */ // and now write the rule to use it std::vector<std::string> depends; @@ -1308,11 +1314,13 @@ cmMakefileTargetGenerator variableNameExternal = this->LocalGenerator->CreateMakeVariable(this->GeneratorTarget->GetName(), "_EXTERNAL_OBJECTS"); + /* clang-format off */ *this->BuildFileStream << "\n" << "# External object files for target " << this->GeneratorTarget->GetName() << "\n" << variableNameExternal << " ="; + /* clang-format on */ for(std::vector<std::string>::const_iterator i = this->ExternalObjects.begin(); i != this->ExternalObjects.end(); ++i) |