[Cmake-commits] CMake branch, next, updated. v2.8.7-3179-gc62e135

[David Cole]

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  c62e13526d19b23d8dcdc1899d5147e58d8b7391 (commit)
       via  0f4dfa6960e51b7460b91f828932a42d5827467a (commit)
      from  4c4defa52a443043a4f4fb724b1b0a7b2a26fc4c (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=c62e13526d19b23d8dcdc1899d5147e58d8b7391
commit c62e13526d19b23d8dcdc1899d5147e58d8b7391
Merge: 4c4defa 0f4dfa6
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Mar 13 14:10:34 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 13 14:10:34 2012 -0400

    Merge topic 'fix-12621-xcode43' into next
    
    0f4dfa6 CPack: Use real path to PackageMaker to find its version file (#12621)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f4dfa6960e51b7460b91f828932a42d5827467a
commit 0f4dfa6960e51b7460b91f828932a42d5827467a
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Mar 13 14:01:19 2012 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Mar 13 14:01:19 2012 -0400

    CPack: Use real path to PackageMaker to find its version file (#12621)
    
    On machines where a usr/bin/packagemaker symlink is found, we were
    unable to find the version.plist file relative to the symlink.
    Resolve the symlink first, so we can find it relative to the
    real PackageMaker.

diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx
index 1633482..7d00452 100644
--- a/Source/CPack/cmCPackPackageMakerGenerator.cxx
+++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx
@@ -402,6 +402,9 @@ int cmCPackPackageMakerGenerator::InitializeInternal()
     this->SetOptionIfNotSet("CPACK_INSTALLER_PROGRAM", pkgPath.c_str());
     }
 
+  // Get path to the real PackageMaker, not a symlink:
+  pkgPath = cmSystemTools::GetRealPath(pkgPath.c_str());
+  // Up from there to find the version.plist file in the "Contents" dir:
   std::string contents_dir;
   contents_dir = cmSystemTools::GetFilenamePath(pkgPath);
   contents_dir = cmSystemTools::GetFilenamePath(contents_dir);

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

Summary of changes:
 Source/CPack/cmCPackPackageMakerGenerator.cxx |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake