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/CPack/cmCPackPackageMakerGenerator.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/CPack/cmCPackPackageMakerGenerator.h')
-rw-r--r-- | Source/CPack/cmCPackPackageMakerGenerator.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/Source/CPack/cmCPackPackageMakerGenerator.h b/Source/CPack/cmCPackPackageMakerGenerator.h index 4e8ff03..2b8d253 100644 --- a/Source/CPack/cmCPackPackageMakerGenerator.h +++ b/Source/CPack/cmCPackPackageMakerGenerator.h @@ -37,8 +37,7 @@ public: virtual bool SupportsComponentInstallation() const; protected: - int CopyInstallScript(const std::string& resdir, - const std::string& script, + int CopyInstallScript(const std::string& resdir, const std::string& script, const std::string& name); virtual int InitializeInternal(); int PackageFiles(); @@ -57,7 +56,7 @@ protected: // Run PackageMaker with the given command line, which will (if // successful) produce the given package file. Returns true if // PackageMaker succeeds, false otherwise. - bool RunPackageMaker(const char *command, const char *packageFile); + bool RunPackageMaker(const char* command, const char* packageFile); // Retrieve the name of package file that will be generated for this // component. The name is just the file name with extension, and @@ -68,8 +67,8 @@ protected: // component. All of the files within this component are stored in // the directory packageDir. Returns true if successful, false // otherwise. - bool GenerateComponentPackage(const char *packageFile, - const char *packageDir, + bool GenerateComponentPackage(const char* packageFile, + const char* packageDir, const cmCPackComponent& component); // Writes a distribution.dist file, which turns a metapackage into a @@ -82,15 +81,14 @@ protected: // Subroutine of WriteDistributionFile that writes out the // dependency attributes for inter-component dependencies. void AddDependencyAttributes(const cmCPackComponent& component, - std::set<const cmCPackComponent *>& visited, + std::set<const cmCPackComponent*>& visited, std::ostringstream& out); // Subroutine of WriteDistributionFile that writes out the // reverse dependency attributes for inter-component dependencies. - void - AddReverseDependencyAttributes(const cmCPackComponent& component, - std::set<const cmCPackComponent *>& visited, - std::ostringstream& out); + void AddReverseDependencyAttributes( + const cmCPackComponent& component, + std::set<const cmCPackComponent*>& visited, std::ostringstream& out); // Generates XML that encodes the hierarchy of component groups and // their components in a form that can be used by distribution |