summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2012-05-17 18:58:20 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2012-05-17 18:58:20 (GMT)
commit851908580307f4e45976eaef562ecf00f4025e28 (patch)
tree35fb6010e91b6fc7db5185f832548eefac928429
parent3e0580ba6536186772203f09091ef960a9704c19 (diff)
parent3d10f65e39790863d8a939b9ea42c9680549a8ae (diff)
downloadCMake-851908580307f4e45976eaef562ecf00f4025e28.zip
CMake-851908580307f4e45976eaef562ecf00f4025e28.tar.gz
CMake-851908580307f4e45976eaef562ecf00f4025e28.tar.bz2
Merge topic 'CPack-preserveTimestampInSourcePackage'
3d10f65 CPack - preserve timestamp for CPACK_INSTALLED_DIRECTORIES. fixes: #0013193
-rw-r--r--Source/CPack/cmCPackGenerator.cxx7
1 files changed, 5 insertions, 2 deletions
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);