[Cmake-commits] CMake branch, next, updated. v3.1.0-1772-gbe4c0c9

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  be4c0c959ea29d10e321b4801dcb9555e1da3231 (commit)
       via  6414e0d35afb185d2255f7a55a859ce0ce52f474 (commit)
      from  05b2bb94d9c908bb2c37bb9cfd74a6baa31c4b5d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be4c0c959ea29d10e321b4801dcb9555e1da3231
commit be4c0c959ea29d10e321b4801dcb9555e1da3231
Merge: 05b2bb9 6414e0d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 12 09:12:42 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 12 09:12:42 2015 -0500

    Merge topic 'cpack-PackageMaker-OSX-10.10' into next
    
    6414e0d3 CPack: Fix line too long in parent commit


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6414e0d35afb185d2255f7a55a859ce0ce52f474
commit 6414e0d35afb185d2255f7a55a859ce0ce52f474
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 12 09:12:26 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 12 09:12:26 2015 -0500

    CPack: Fix line too long in parent commit

diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx
index 09f9e6b..e58415c 100644
--- a/Source/CPack/cmCPackPackageMakerGenerator.cxx
+++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx
@@ -534,7 +534,8 @@ int cmCPackPackageMakerGenerator::InitializeInternal()
     int res = sscanf(packageCompat, "%u.%u", &majorVersion, &minorVersion);
     if (res == 2)
       {
-      this->PackageCompatibilityVersion = getVersion(majorVersion, minorVersion);
+      this->PackageCompatibilityVersion =
+        getVersion(majorVersion, minorVersion);
       }
     }
   else if (this->GetOption("CPACK_DOWNLOAD_SITE"))

-----------------------------------------------------------------------

Summary of changes:
 Source/CPack/cmCPackPackageMakerGenerator.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake