mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-03 05:08:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'cpack-source-dir-symlink'

Browse Source 
c456b09513 CPack: Fix symbolic link detection for directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5879
This commit is contained in:
Brad King
2021-03-05 13:22:28 +00:00
committed by Kitware Robot
parent 96ee96c6d5 c456b09513
commit c1bbe44dad
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/CPack/cmCPackGenerator.cxx
View File

@@ -384,7 +384,8 @@ int cmCPackGenerator::InstallProjectViaInstalledDirectories(
for (std::string const& gf : this->files) {
bool skip = false;
std::string inFile = gf;
if (cmSystemTools::FileIsDirectory(gf)) {
if (cmSystemTools::FileIsDirectory(gf) &&
!cmSystemTools::FileIsSymlink(gf)) {
inFile += '/';
}
for (cmsys::RegularExpression& reg : ignoreFilesRegex) {