diff options
| author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 10:34:04 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-05-16 16:05:19 -0400 |
| commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
| tree | dca71b9a7e267f4c6300da3eb770415381726785 /Source/cmGlobalJOMMakefileGenerator.cxx | |
| parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
| download | cmake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz | |
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/cmGlobalJOMMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalJOMMakefileGenerator.cxx | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/Source/cmGlobalJOMMakefileGenerator.cxx b/Source/cmGlobalJOMMakefileGenerator.cxx index 6ae82d8f8b..0bdd624a62 100644 --- a/Source/cmGlobalJOMMakefileGenerator.cxx +++ b/Source/cmGlobalJOMMakefileGenerator.cxx @@ -29,10 +29,8 @@ cmGlobalJOMMakefileGenerator::cmGlobalJOMMakefileGenerator(cmake* cm) this->MakeSilentFlag = "/nologo"; } -void cmGlobalJOMMakefileGenerator -::EnableLanguage(std::vector<std::string>const& l, - cmMakefile *mf, - bool optional) +void cmGlobalJOMMakefileGenerator::EnableLanguage( + std::vector<std::string> const& l, cmMakefile* mf, bool optional) { // pick a default mf->AddDefinition("CMAKE_GENERATOR_CC", "cl"); @@ -40,19 +38,17 @@ void cmGlobalJOMMakefileGenerator this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional); } -void cmGlobalJOMMakefileGenerator -::GetDocumentation(cmDocumentationEntry& entry) +void cmGlobalJOMMakefileGenerator::GetDocumentation( + cmDocumentationEntry& entry) { entry.Name = cmGlobalJOMMakefileGenerator::GetActualName(); entry.Brief = "Generates JOM makefiles."; } -void cmGlobalJOMMakefileGenerator::PrintCompilerAdvice(std::ostream& os, - std::string const& lang, - const char* envVar) const +void cmGlobalJOMMakefileGenerator::PrintCompilerAdvice( + std::ostream& os, std::string const& lang, const char* envVar) const { - if(lang == "CXX" || lang == "C") - { + if (lang == "CXX" || lang == "C") { /* clang-format off */ os << "To use the JOM generator with Visual C++, cmake must be run from a " @@ -60,6 +56,6 @@ void cmGlobalJOMMakefileGenerator::PrintCompilerAdvice(std::ostream& os, "environment is unable to invoke the cl compiler. To fix this problem, " "run cmake from the Visual Studio Command Prompt (vcvarsall.bat).\n"; /* clang-format on */ - } + } this->cmGlobalUnixMakefileGenerator3::PrintCompilerAdvice(os, lang, envVar); } |