From 464567a577555659610b2a26f9c1733d672583de Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 23 Jun 2014 13:54:52 -0400 Subject: file(INSTALL): Report existing DIRECTORY as Up-to-date Teach cmFileCopier::InstallDirectory to detect whether the destination directory exists. If so, report it as "Up-to-date" instead of "Installing". This resolves message asymmetry with file installations. Extend the RunCMake.file and RunCMake.install tests to check the installation output on both the first and second run. Suggested-by: J Decker --- Source/cmFileCommand.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Source/cmFileCommand.cxx') diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 83f356a1c6..99c7ad13ea 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -1613,7 +1613,8 @@ bool cmFileCopier::InstallDirectory(const char* source, MatchProperties const& match_properties) { // Inform the user about this directory installation. - this->ReportCopy(destination, TypeDir, true); + this->ReportCopy(destination, TypeDir, + !cmSystemTools::FileIsDirectory(destination)); // Make sure the destination directory exists. if(!cmSystemTools::MakeDirectory(destination)) -- cgit v1.2.1