From 569fb1893e6d49677e3724b82e578b568aaa1504 Mon Sep 17 00:00:00 2001 From: John Parent Date: Thu, 22 Sep 2022 12:54:22 -0400 Subject: file(INSTALL): Report "Installing:" for a symlink to a directory --- Source/cmFileCopier.cxx | 5 ++++- Tests/RunCMake/install/DIRECTORY-symlink-clobber-all-stdout.txt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Source/cmFileCopier.cxx b/Source/cmFileCopier.cxx index 70e6089..ef55abf 100644 --- a/Source/cmFileCopier.cxx +++ b/Source/cmFileCopier.cxx @@ -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; diff --git a/Tests/RunCMake/install/DIRECTORY-symlink-clobber-all-stdout.txt b/Tests/RunCMake/install/DIRECTORY-symlink-clobber-all-stdout.txt index e69ef02..db8ca10 100644 --- a/Tests/RunCMake/install/DIRECTORY-symlink-clobber-all-stdout.txt +++ b/Tests/RunCMake/install/DIRECTORY-symlink-clobber-all-stdout.txt @@ -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 -- cgit v0.12 ion> Tcl is a high-level, general-purpose, interpreted, dynamic programming language. It was designed with the goal of being very simple but powerful.
summaryrefslogtreecommitdiffstats
path: root/tests
ModeNameSize
-rw-r--r--README4471logstatsplain
-rw-r--r--all.tcl613logstatsplain
-rw-r--r--append.test6412logstatsplain
-rw-r--r--appendComp.test8873logstatsplain
-rw-r--r--assocd.test2108logstatsplain
-rw-r--r--async.test6005logstatsplain
-rw-r--r--autoMkindex.test10619logstatsplain
-rw-r--r--basic.test31394logstatsplain
-rw-r--r--binary.test78603logstatsplain
-rw-r--r--case.test3014logstatsplain
-rw-r--r--chan.test3945logstatsplain
-rw-r--r--clock.test1834542logstatsplain
-rw-r--r--cmdAH.test50840logstatsplain
-rw-r--r--cmdIL.test23981logstatsplain
-rw-r--r--cmdInfo.test3692logstatsplain
-rw-r--r--cmdMZ.test12046logstatsplain
-rw-r--r--compExpr-old.test39323logstatsplain
-rw-r--r--compExpr.test16160logstatsplain
-rw-r--r--compile.test20320logstatsplain
-rw-r--r--concat.test1610logstatsplain
-rw-r--r--config.test2321logstatsplain
-rw-r--r--dcall.test1397logstatsplain
-rw-r--r--dict.test36345logstatsplain
-rw-r--r--dstring.test10198logstatsplain
-rw-r--r--encoding.test18320logstatsplain
-rw-r--r--env.test7162logstatsplain
-rw-r--r--error.test6563logstatsplain
-rw-r--r--eval.test2333logstatsplain
-rw-r--r--event.test17420logstatsplain
-rw-r--r--exec.test25212logstatsplain
-rw-r--r--execute.test24846logstatsplain
-rw-r--r--expr-old.test48451logstatsplain
-rw-r--r--expr.test324849logstatsplain
-rw-r--r--fCmd.test79116logstatsplain
-rw-r--r--fileName.test53339logstatsplain
-rw-r--r--fileSystem.test32226logstatsplain
-rw-r--r--for-old.test2009logstatsplain
-rw-r--r--for.test25172logstatsplain
-rw-r--r--foreach.test6462logstatsplain
-rw-r--r--format.test20169logstatsplain
-rw-r--r--get.test4496logstatsplain
-rw-r--r--history.test8044logstatsplain
-rw-r--r--http.test17175logstatsplain
-rw-r--r--httpd5324logstatsplain
-rw-r--r--httpold.test7917logstatsplain
-rw-r--r--if-old.test4836logstatsplain
-rw-r--r--if.test27408logstatsplain
-rw-r--r--incr-old.test3035logstatsplain
-rw-r--r--incr.test17716logstatsplain
-rw-r--r--indexObj.test4297logstatsplain
-rw-r--r--info.test20812logstatsplain
-rw-r--r--init.test6375logstatsplain
-rw-r--r--interp.test93241logstatsplain
-rw-r--r--io.test220672logstatsplain
-rw-r--r--ioCmd.test105809logstatsplain
-rw-r--r--ioUtil.test12441logstatsplain
-rw-r--r--iogt.test21495logstatsplain
-rw-r--r--join.test1609logstatsplain
-rw-r--r--lindex.test12844logstatsplain
-rw-r--r--link.test10996logstatsplain
-rw-r--r--linsert.test3566logstatsplain
-rw-r--r--list.test4131logstatsplain
-rw-r--r--listObj.test6713logstatsplain
-rw-r--r--llength.test1341logstatsplain
-rw-r--r--load.test8335logstatsplain
-rw-r--r--lrange.test3024logstatsplain
-rw-r--r--lrepeat.test1896logstatsplain
-rw-r--r--lreplace.test4338logstatsplain