diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-23 17:54:52 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-06-24 16:52:11 (GMT) |
| commit | 464567a577555659610b2a26f9c1733d672583de (patch) | |
| tree | a503f824f6f010fffc605d81747cd56a54e3f66d /Source/cmFileCommand.cxx | |
| parent | f701b0b7f7eb4a7cd6fe96f285835b03604fb477 (diff) | |
| download | CMake-464567a577555659610b2a26f9c1733d672583de.zip CMake-464567a577555659610b2a26f9c1733d672583de.tar.gz CMake-464567a577555659610b2a26f9c1733d672583de.tar.bz2 | |
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 <d3ck0r@gmail.com>
Diffstat (limited to 'Source/cmFileCommand.cxx')
| -rw-r--r-- | Source/cmFileCommand.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 83f356a..99c7ad1 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)) |