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

CPack: Fix symbolic link detection for directories

Browse Source 
In the case where the current path is a symlink to a directory, a
trailing slash causes the link to be dereferenced, which means that any
subsequent `FileIsSymlink` on it will return false.

Fixes: #21886
This commit is contained in:
Olivier Iffrig
2021-03-04 17:04:56 +00:00
committed by Brad King
parent 1dde7e350a
commit c456b09513
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/CPack/cmCPackGenerator.cxx
+2 -1
View File
@@ -384,7 +384,8 @@ int cmCPackGenerator::InstallProjectViaInstalledDirectories(
for (std::string const& gf : this->files) { for (std::string const& gf : this->files) {
bool skip = false; bool skip = false;
std::string inFile = gf; std::string inFile = gf;
if (cmSystemTools::FileIsDirectory(gf)) { if (cmSystemTools::FileIsDirectory(gf) &&
!cmSystemTools::FileIsSymlink(gf)) {
inFile += '/'; inFile += '/';
} }
for (cmsys::RegularExpression& reg : ignoreFilesRegex) { for (cmsys::RegularExpression& reg : ignoreFilesRegex) {