diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx b/Source/CPack/cmCPackArchiveGenerator.cxx index 8ee56374b1..27828f588e 100644 --- a/Source/CPack/cmCPackArchiveGenerator.cxx +++ b/Source/CPack/cmCPackArchiveGenerator.cxx @@ -361,7 +361,8 @@ int cmCPackArchiveGenerator::addOneComponentToArchive( } else if (status == DeduplicateStatus::Error) { cmCPackLogger(cmCPackLog::LOG_ERROR, "ERROR The data in files with the " - "same filename is different."); + "same filename is different: " + << rp << std::endl); return 0; } else { cmCPackLogger(cmCPackLog::LOG_DEBUG, diff --git a/Tests/RunCMake/CPack/tests/DUPLICATE_FILE/conflict_file-stderr.txt b/Tests/RunCMake/CPack/tests/DUPLICATE_FILE/conflict_file-stderr.txt index 55448853e0..003c396414 100644 --- a/Tests/RunCMake/CPack/tests/DUPLICATE_FILE/conflict_file-stderr.txt +++ b/Tests/RunCMake/CPack/tests/DUPLICATE_FILE/conflict_file-stderr.txt @@ -1 +1 @@ -CPack Error: ERROR The data in files with the same filename is different.* +CPack Error: ERROR The data in files with the same filename is different: files/1\.txt diff --git a/Tests/RunCMake/CPack/tests/DUPLICATE_FILE/conflict_symlink-stderr.txt b/Tests/RunCMake/CPack/tests/DUPLICATE_FILE/conflict_symlink-stderr.txt index 55448853e0..ac23e711ff 100644 --- a/Tests/RunCMake/CPack/tests/DUPLICATE_FILE/conflict_symlink-stderr.txt +++ b/Tests/RunCMake/CPack/tests/DUPLICATE_FILE/conflict_symlink-stderr.txt @@ -1 +1 @@ -CPack Error: ERROR The data in files with the same filename is different.* +CPack Error: ERROR The data in files with the same filename is different: files/symlink2