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/cmLocalNinjaGenerator.h | |
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/cmLocalNinjaGenerator.h')
-rw-r--r-- | Source/cmLocalNinjaGenerator.h | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/Source/cmLocalNinjaGenerator.h b/Source/cmLocalNinjaGenerator.h index 9746a3c..afaa24c 100644 --- a/Source/cmLocalNinjaGenerator.h +++ b/Source/cmLocalNinjaGenerator.h @@ -38,8 +38,8 @@ public: virtual void Generate(); - virtual - std::string GetTargetDirectory(cmGeneratorTarget const* target) const; + virtual std::string GetTargetDirectory( + cmGeneratorTarget const* target) const; const cmGlobalNinjaGenerator* GetGlobalNinjaGenerator() const; cmGlobalNinjaGenerator* GetGlobalNinjaGenerator(); @@ -50,14 +50,17 @@ public: /// @returns the relative path between the HomeOutputDirectory and this /// local generators StartOutputDirectory. std::string GetHomeRelativeOutputPath() const - { return this->HomeRelativeOutputPath; } + { + return this->HomeRelativeOutputPath; + } void ExpandRuleVariables(std::string& string, - const RuleVariables& replaceValues) { + const RuleVariables& replaceValues) + { cmLocalGenerator::ExpandRuleVariables(string, replaceValues); } - std::string BuildCommandLine(const std::vector<std::string> &cmdLines); + std::string BuildCommandLine(const std::vector<std::string>& cmdLines); void AppendTargetOutputs(cmGeneratorTarget* target, cmNinjaDeps& outputs); void AppendTargetDepends(cmGeneratorTarget* target, cmNinjaDeps& outputs); @@ -65,24 +68,22 @@ public: void AddCustomCommandTarget(cmCustomCommand const* cc, cmGeneratorTarget* target); void AppendCustomCommandLines(cmCustomCommandGenerator const& ccg, - std::vector<std::string> &cmdLines); + std::vector<std::string>& cmdLines); void AppendCustomCommandDeps(cmCustomCommandGenerator const& ccg, - cmNinjaDeps &ninjaDeps); + cmNinjaDeps& ninjaDeps); virtual std::string ConvertToLinkReference(std::string const& lib, OutputFormat format = SHELL); virtual void ComputeObjectFilenames( - std::map<cmSourceFile const*, std::string>& mapping, - cmGeneratorTarget const* gt = 0); - + std::map<cmSourceFile const*, std::string>& mapping, + cmGeneratorTarget const* gt = 0); protected: virtual std::string ConvertToIncludeReference(std::string const& path, OutputFormat format = SHELL, bool forceFullPaths = false); - private: cmGeneratedFileStream& GetBuildFileStream() const; cmGeneratedFileStream& GetRulesFileStream() const; @@ -95,7 +96,7 @@ private: void WritePools(std::ostream& os); void WriteCustomCommandRule(); - void WriteCustomCommandBuildStatement(cmCustomCommand const *cc, + void WriteCustomCommandBuildStatement(cmCustomCommand const* cc, const cmNinjaDeps& orderOnlyDeps); void WriteCustomCommandBuildStatements(); |