[Cmake-commits] CMake branch, next, updated. v3.1.1-2470-g9eaeba8

[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  9eaeba8f0bcff213de7a42eebe1c9a46ffe78e65 (commit)
       via  f3f323044344e250f9235ed820f3b28c5b2b3dde (commit)
      from  d9a5a1f7e5bdb5960d153a00595a237e4f69e97b (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=9eaeba8f0bcff213de7a42eebe1c9a46ffe78e65
commit 9eaeba8f0bcff213de7a42eebe1c9a46ffe78e65
Merge: d9a5a1f f3f3230
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Jan 29 14:34:11 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 29 14:34:11 2015 -0500

    Merge topic 'fix-cpack-symlink-create-dir' into next
    
    f3f32304 Put a check in to make sure there is a directory to create.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3f323044344e250f9235ed820f3b28c5b2b3dde
commit f3f323044344e250f9235ed820f3b28c5b2b3dde
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Jan 29 14:22:43 2015 -0500
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Thu Jan 29 14:22:43 2015 -0500

    Put a check in to make sure there is a directory to create.

diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 9d3d9fd..9e33d23 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -440,10 +440,14 @@ int cmCPackGenerator::InstallProjectViaInstalledDirectories(
           // make sure directory exists for symlink
           std::string destDir =
             cmSystemTools::GetFilenamePath(symlinkedIt->second);
-          if(!cmSystemTools::MakeDirectory(destDir))
+          if(!destDir.empty() && !cmSystemTools::MakeDirectory(destDir))
             {
             cmCPackLogger(cmCPackLog::LOG_ERROR, "Cannot create dir: "
-                          << destDir << std::endl);
+                          << destDir
+                          << "\nTrying to create symlink: "
+                          << symlinkedIt->second << "--> "
+                          << symlinkedIt->first
+                          << std::endl);
             }
           if (!cmSystemTools::CreateSymlink(symlinkedIt->first,
                                             symlinkedIt->second))

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

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


hooks/post-receive
-- 
CMake