[Cmake-commits] CMake branch, next, updated. v2.8.9-1081-g18797e9

[Eric Noulard]

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  18797e91e3992858f4bd9d8321c5405bdbc3ecc7 (commit)
       via  ddec0533213ef8c7ea80f31d82e4f7baabcd3956 (commit)
      from  23c0c4541e93de093aa53e668206721b138b3996 (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=18797e91e3992858f4bd9d8321c5405bdbc3ecc7
commit 18797e91e3992858f4bd9d8321c5405bdbc3ecc7
Merge: 23c0c45 ddec053
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Sun Oct 14 12:54:24 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Oct 14 12:54:24 2012 -0400

    Merge topic 'CPack-ArchiveGen-andDESTIR_ON' into next
    
    ddec053 Make CPACK_SET_DESTDIR work with archive generator + component-based packaging


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ddec0533213ef8c7ea80f31d82e4f7baabcd3956
commit ddec0533213ef8c7ea80f31d82e4f7baabcd3956
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Sun Oct 14 18:50:57 2012 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Sun Oct 14 18:50:57 2012 +0200

    Make CPACK_SET_DESTDIR work with archive generator + component-based packaging
    
    Fix bug #13004. The patch is from Stanislaw Szymczyk.

diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index f113400..fb08d36 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -905,7 +905,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
             localFileName =
                 cmSystemTools::RelativePath(InstallPrefix, fit->c_str());
             localFileName =
-                localFileName.substr(localFileName.find('/')+1,
+                localFileName.substr(localFileName.find_first_not_of('/'),
                                      std::string::npos);
             Components[installComponent].Files.push_back(localFileName);
             cmCPackLogger(cmCPackLog::LOG_DEBUG, "Adding file <"

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

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


hooks/post-receive
-- 
CMake