[Cmake-commits] CMake branch, next, updated. v3.1.1-2500-ge19b6e6

Brad King brad.king at kitware.com
Fri Jan 30 10:05:09 EST 2015


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  e19b6e6bc235a94290eb574043488876197fce1a (commit)
       via  942da844ab9c47660a7353980a52932c37f40ac9 (commit)
      from  12992551e8100fe99d47e71445af53c2cc06e445 (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=e19b6e6bc235a94290eb574043488876197fce1a
commit e19b6e6bc235a94290eb574043488876197fce1a
Merge: 1299255 942da84
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 30 10:05:08 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 30 10:05:08 2015 -0500

    Merge topic 'fix-cpack-symlink-create-dir' into next
    
    942da844 fixup! Fix bug where symlink could not be created


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=942da844ab9c47660a7353980a52932c37f40ac9
commit 942da844ab9c47660a7353980a52932c37f40ac9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 30 10:04:41 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 30 10:04:41 2015 -0500

    fixup! Fix bug where symlink could not be created

diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 9e33d23..1c670d2 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -435,8 +435,8 @@ 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);

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list