[Cmake-commits] CMake branch, next, updated. v3.1.1-2502-gaa26ab1

[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  aa26ab1623e5b412167dbb7e45f065cf78cd148f (commit)
       via  81221b80e2d74d120bfb61c62e07e3f7f1b9929f (commit)
      from  e19b6e6bc235a94290eb574043488876197fce1a (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=aa26ab1623e5b412167dbb7e45f065cf78cd148f
commit aa26ab1623e5b412167dbb7e45f065cf78cd148f
Merge: e19b6e6 81221b8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 30 10:06:40 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 30 10:06:40 2015 -0500

    Merge topic 'fix-cpack-symlink-create-dir' into next
    
    81221b80 CPack: Fix packaging of source tarballs with symbolic links


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81221b80e2d74d120bfb61c62e07e3f7f1b9929f
commit 81221b80e2d74d120bfb61c62e07e3f7f1b9929f
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:06:09 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 f21fcf6..1c670d2 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,
                                             symlinkedIt->second))
             {

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

Summary of changes:


hooks/post-receive
-- 
CMake