mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 22:30:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

file(INSTALL): Report "Installing:" for a symlink to a directory

Browse Source
This commit is contained in:
John Parent
2022-09-22 12:54:22 -04:00
committed by Brad King
parent 1461ae4933
commit 569fb1893e
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmFileCopier.cxx
View File

@@ -647,7 +647,10 @@ bool cmFileCopier::InstallDirectory(const std::string& source,
{
// Inform the user about this directory installation.
this->ReportCopy(destination, TypeDir,
!cmSystemTools::FileIsDirectory(destination));
!( // Report "Up-to-date:" for existing directories,
// but not symlinks to them.
cmSystemTools::FileIsDirectory(destination) &&
!cmSystemTools::FileIsSymlink(destination)));
// check if default dir creation permissions were set
mode_t default_dir_mode_v = 0;

2
Tests/RunCMake/install/DIRECTORY-symlink-clobber-all-stdout.txt
View File

@@ -4,7 +4,7 @@
]*/Tests/RunCMake/install/DIRECTORY-symlink-clobber-build/root-all/dest/dir/file
-- Installing: [^
]*/Tests/RunCMake/install/DIRECTORY-symlink-clobber-build/root-all/dest/lnk
-- Up-to-date: [^
-- Installing: [^
]*/Tests/RunCMake/install/DIRECTORY-symlink-clobber-build/root-all/dest/lnk
-- Up-to-date: [^
]*/Tests/RunCMake/install/DIRECTORY-symlink-clobber-build/root-all/dest/lnk/file