Merge topic 'cleanup-style'

68bc863 Merge branch 'master' into cleanup-style
a05eba5 CMakeVersion.bash: Update sed expression for lower-case 'set'
3c0488d Fix WarnUnusedUnusedViaUnset test pass/fail regex
6c2c483 Remove trailing TAB from NSIS.template.in
9db3116 Remove CMake-language block-end command arguments
77543bd Convert CMake-language commands to lower case
7bbaa42 Remove trailing whitespace from most CMake and C/C++ code
be9db98 Merge topic 'watcom-compiler-version'
af42ae4 Watcom: Simplify compiler version detection (#11866)

1 files changed, 5 insertions, 5 deletions

diff --git a/Source/CPack/cmCPackPackageMakerGenerator.h b/Source/CPack/cmCPackPackageMakerGenerator.h
index 2bab947..101813f 100644
--- a/Source/CPack/cmCPackPackageMakerGenerator.h
+++ b/Source/CPack/cmCPackPackageMakerGenerator.h
@@ -67,8 +67,8 @@ protected:
   // Generate a package in the file packageFile for the given
   // 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, 
+  // otherwise.
+  bool GenerateComponentPackage(const char *packageFile,
                                 const char *packageDir,
                                 const cmCPackComponent& component);
 
@@ -87,14 +87,14 @@ protected:
 
   // Subroutine of WriteDistributionFile that writes out the
   // reverse dependency attributes for inter-component dependencies.
-  void 
+  void
   AddReverseDependencyAttributes(const cmCPackComponent& component,
                                  std::set<const cmCPackComponent *>& visited,
                                  cmOStringStream& out);
 
   // Generates XML that encodes the hierarchy of component groups and
   // their components in a form that can be used by distribution
-  // metapackages. 
+  // metapackages.
   void CreateChoiceOutline(const cmCPackComponentGroup& group,
                            cmOStringStream& out);
 
@@ -111,7 +111,7 @@ protected:
   // Escape the given string to make it usable as an XML attribute
   // value.
   std::string EscapeForXML(std::string str);
-  
+
   double PackageMakerVersion;
   double PackageCompatibilityVersion;
 };