[Cmake-commits] CMake branch, next, updated. v2.8.8-2848-gb1a8804

[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  b1a88048d97af7f67ff245a07b81333d54607c51 (commit)
       via  3d10f65e39790863d8a939b9ea42c9680549a8ae (commit)
      from  8fc1fd50fa0035a34359b0af9aa7385c2f149859 (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=b1a88048d97af7f67ff245a07b81333d54607c51
commit b1a88048d97af7f67ff245a07b81333d54607c51
Merge: 8fc1fd5 3d10f65
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Wed May 9 16:50:53 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 9 16:50:53 2012 -0400

    Merge topic 'CPack-preserveTimestampInSourcePackage' into next
    
    3d10f65 CPack - preserve timestamp for CPACK_INSTALLED_DIRECTORIES. fixes: #0013193


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d10f65e39790863d8a939b9ea42c9680549a8ae
commit 3d10f65e39790863d8a939b9ea42c9680549a8ae
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Wed May 9 18:02:13 2012 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Wed May 9 18:02:13 2012 +0200

    CPack - preserve timestamp for CPACK_INSTALLED_DIRECTORIES. fixes: #0013193

diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 0f832b3..de8f1e0 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -388,8 +388,11 @@ int cmCPackGenerator::InstallProjectViaInstalledDirectories(
                                    std::string>(targetFile,inFileRelative));
           }
         /* If it is not a symlink then do a plain copy */
-        else if ( !cmSystemTools::CopyFileIfDifferent(inFile.c_str(),
-            filePath.c_str()) )
+        else if (!(
+            cmSystemTools::CopyFileIfDifferent(inFile.c_str(),filePath.c_str())
+            &&
+            cmSystemTools::CopyFileTime(inFile.c_str(),filePath.c_str())
+                ) )
           {
           cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem copying file: "
             << inFile.c_str() << " -> " << filePath.c_str() << std::endl);

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

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


hooks/post-receive
-- 
CMake