[Cmake-commits] CMake branch, master, updated. v3.1.0-762-gfa636e1

[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, master has been updated
       via  fa636e19ce42c7523c4858ea697376fe94080097 (commit)
       via  70abf6e780185c9c7041593bc99aff0a26bc9265 (commit)
      from  526a80b32a28bf3a1601ed086bba10f9059d5940 (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=fa636e19ce42c7523c4858ea697376fe94080097
commit fa636e19ce42c7523c4858ea697376fe94080097
Merge: 526a80b 70abf6e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 15 09:53:56 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 15 09:53:56 2015 -0500

    Merge topic 'cpack-PackageMaker-OSX-10.10'
    
    70abf6e7 CPack: Fix PackageMaker internal versioning for OS X 10.10

diff --cc Source/CPack/cmCPackPackageMakerGenerator.cxx
index 8a22131,e58415c..dfe35c9
--- a/Source/CPack/cmCPackPackageMakerGenerator.cxx
+++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx
@@@ -710,9 -726,9 +726,9 @@@ GenerateComponentPackage(const char *pa
                  packageFile << std::endl);
  
    // The command that will be used to run PackageMaker
 -  cmOStringStream pkgCmd;
 +  std::ostringstream pkgCmd;
  
-   if (this->PackageCompatibilityVersion < 10.5 ||
+   if (this->PackageCompatibilityVersion < getVersion(10, 5) ||
        this->PackageMakerVersion < 3.0)
      {
      // Create Description.plist and Info.plist files for normal Mac OS

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

Summary of changes:
 Source/CPack/cmCPackPackageMakerGenerator.cxx |   34 ++++++++++++++++++-------
 Source/CPack/cmCPackPackageMakerGenerator.h   |    2 +-
 2 files changed, 26 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake