[Cmake-commits] CMake branch, next, updated. v3.1.1-2505-gd23ac47

[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  d23ac474f4eecc9b2df70a6205299927253e42fe (commit)
       via  55e68bc99e62430ba2a94410992effd87bea7e33 (commit)
       via  4dc5acee634b3ac72f2e1c2f1ca0489526a86cf3 (commit)
      from  aa26ab1623e5b412167dbb7e45f065cf78cd148f (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=d23ac474f4eecc9b2df70a6205299927253e42fe
commit d23ac474f4eecc9b2df70a6205299927253e42fe
Merge: aa26ab1 55e68bc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 30 10:10:47 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 30 10:10:47 2015 -0500

    Merge topic 'fix-cpack-symlink-create-dir' into next
    
    55e68bc9 Merge branch 'backport-fix-cpack-symlink-create-dir' into fix-cpack-symlink-create-dir
    4dc5acee CPack: Fix packaging of source tarballs with symbolic links


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55e68bc99e62430ba2a94410992effd87bea7e33
commit 55e68bc99e62430ba2a94410992effd87bea7e33
Merge: 81221b8 4dc5ace
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 30 10:09:37 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 30 10:09:37 2015 -0500

    Merge branch 'backport-fix-cpack-symlink-create-dir' into fix-cpack-symlink-create-dir
    
    Resolve conflict in Source/CPack/cmCPackGenerator.cxx with our side.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4dc5acee634b3ac72f2e1c2f1ca0489526a86cf3
commit 4dc5acee634b3ac72f2e1c2f1ca0489526a86cf3
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Jan 29 11:52:30 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 30 10:08:12 2015 -0500

    CPack: Fix packaging of source tarballs with symbolic links
    
    When staging the package installation, if the first file in a directory
    happens to be a symbolic link, make sure we create the directory before
    trying to create the link.

diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 84e6482..8139d29 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -437,6 +437,18 @@ int cmCPackGenerator::InstallProjectViaInstalledDirectories(
           cmCPackLogger(cmCPackLog::LOG_DEBUG, "Will create a symlink: "
                          << symlinkedIt->second << "--> "
                          << symlinkedIt->first << std::endl);
+          // make sure directory exists for symlink
+          std::string destDir =
+            cmSystemTools::GetFilenamePath(symlinkedIt->second);
+          if(!destDir.empty() && !cmSystemTools::MakeDirectory(destDir))
+            {
+            cmCPackLogger(cmCPackLog::LOG_ERROR, "Cannot create dir: "
+                          << destDir
+                          << "\nTrying to create symlink: "
+                          << symlinkedIt->second << "--> "
+                          << symlinkedIt->first
+                          << std::endl);
+            }
           if (!cmSystemTools::CreateSymlink((symlinkedIt->first).c_str(),
                                             (symlinkedIt->second).c_str()))
             {

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

Summary of changes:


hooks/post-receive
-- 
CMake