[Cmake-commits] CMake branch, next, updated. v3.0.0-3931-gfaea5f2

[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  faea5f229a9dc2afe657347a1a763ba892a0da83 (commit)
       via  44febfcd936fc4bc4cba3afa08be7a55852eb9dc (commit)
      from  d52aaef1123124523d285227a85e03ad8761744d (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=faea5f229a9dc2afe657347a1a763ba892a0da83
commit faea5f229a9dc2afe657347a1a763ba892a0da83
Merge: d52aaef 44febfc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 25 11:34:31 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 25 11:34:31 2014 -0400

    Merge topic 'libarchive-encoding' into next
    
    44febfcd cmArchiveWrite: Fix archive_entry_copy_pathname call to use dest


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44febfcd936fc4bc4cba3afa08be7a55852eb9dc
commit 44febfcd936fc4bc4cba3afa08be7a55852eb9dc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 25 11:34:00 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 25 11:34:00 2014 -0400

    cmArchiveWrite: Fix archive_entry_copy_pathname call to use dest
    
    In cmArchiveWrite::AddFile, set the pathname to 'dest', not 'file'.

diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index 593808b..e6a3e70 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -239,10 +239,10 @@ bool cmArchiveWrite::AddFile(const char* file,
   Entry e;
 #if cmsys_STL_HAS_WSTRING
   archive_entry_copy_sourcepath_w(e, cmsys::Encoding::ToWide(file).c_str());
-  archive_entry_copy_pathname_w(e, cmsys::Encoding::ToWide(file).c_str());
+  archive_entry_copy_pathname_w(e, cmsys::Encoding::ToWide(dest).c_str());
 #else
   archive_entry_copy_sourcepath(e, file);
-  archive_entry_copy_pathname(e, file);
+  archive_entry_copy_pathname(e, dest.c_str());
 #endif
   if(archive_read_disk_entry_from_file(this->Disk, e, -1, 0) != ARCHIVE_OK)
     {

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

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


hooks/post-receive
-- 
CMake