[Cmake-commits] CMake branch, next, updated. v3.1.1-2468-gd9a5a1f

[Bill Hoffman]

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  d9a5a1f7e5bdb5960d153a00595a237e4f69e97b (commit)
       via  1e10b57a9c49cdace423970d14514b3462ce61f4 (commit)
      from  fcfce76d09ba7d5337ed8e198b9998d7d2f6f5fc (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=d9a5a1f7e5bdb5960d153a00595a237e4f69e97b
commit d9a5a1f7e5bdb5960d153a00595a237e4f69e97b
Merge: fcfce76 1e10b57
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Jan 29 12:32:29 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 29 12:32:29 2015 -0500

    Merge topic 'fix-cpack-symlink-create-dir' into next
    
    1e10b57a Fix bug where symlink could not be created because directory did not exist.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e10b57a9c49cdace423970d14514b3462ce61f4
commit 1e10b57a9c49cdace423970d14514b3462ce61f4
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Jan 29 11:52:30 2015 -0500
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Thu Jan 29 11:52:30 2015 -0500

    Fix bug where symlink could not be created because directory did not exist.

diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index f21fcf6..9d3d9fd 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -435,8 +435,16 @@ int cmCPackGenerator::InstallProjectViaInstalledDirectories(
              ++symlinkedIt)
           {
           cmCPackLogger(cmCPackLog::LOG_DEBUG, "Will create a symlink: "
-                         << symlinkedIt->second << "--> "
-                         << symlinkedIt->first << std::endl);
+                        << symlinkedIt->second << "--> "
+                        << symlinkedIt->first << std::endl);
+          // make sure directory exists for symlink
+          std::string destDir =
+            cmSystemTools::GetFilenamePath(symlinkedIt->second);
+          if(!cmSystemTools::MakeDirectory(destDir))
+            {
+            cmCPackLogger(cmCPackLog::LOG_ERROR, "Cannot create dir: "
+                          << destDir << std::endl);
+            }
           if (!cmSystemTools::CreateSymlink(symlinkedIt->first,
                                             symlinkedIt->second))
             {

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

Summary of changes:
 Source/CPack/cmCPackGenerator.cxx |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake