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 /Tests/RunCMake/file | |
| 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 'Tests/RunCMake/file')
| -rw-r--r-- | Tests/RunCMake/file/INSTALL-DIRECTORY-stdout.txt | 6 | ||||
| -rw-r--r-- | Tests/RunCMake/file/INSTALL-DIRECTORY.cmake | 7 | ||||
| -rw-r--r-- | Tests/RunCMake/file/RunCMakeTest.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/file/dir/empty.txt | 0 |
4 files changed, 14 insertions, 0 deletions
diff --git a/Tests/RunCMake/file/INSTALL-DIRECTORY-stdout.txt b/Tests/RunCMake/file/INSTALL-DIRECTORY-stdout.txt new file mode 100644 index 0000000..d2e6f4d --- /dev/null +++ b/Tests/RunCMake/file/INSTALL-DIRECTORY-stdout.txt @@ -0,0 +1,6 @@ +-- Before Installing +-- Installing: .*/Tests/RunCMake/file/INSTALL-DIRECTORY-build/dir +-- Installing: .*/Tests/RunCMake/file/INSTALL-DIRECTORY-build/dir/empty.txt +-- Up-to-date: .*/Tests/RunCMake/file/INSTALL-DIRECTORY-build/dir +-- Up-to-date: .*/Tests/RunCMake/file/INSTALL-DIRECTORY-build/dir/empty.txt +-- After Installing diff --git a/Tests/RunCMake/file/INSTALL-DIRECTORY.cmake b/Tests/RunCMake/file/INSTALL-DIRECTORY.cmake new file mode 100644 index 0000000..8bcb077 --- /dev/null +++ b/Tests/RunCMake/file/INSTALL-DIRECTORY.cmake @@ -0,0 +1,7 @@ +set(src ${CMAKE_CURRENT_SOURCE_DIR}/dir) +set(dst ${CMAKE_CURRENT_BINARY_DIR}/dir) +file(REMOVE RECURSE ${dst}) +message(STATUS "Before Installing") +file(INSTALL FILES ${src}/ DESTINATION ${dst} TYPE DIRECTORY) +file(INSTALL FILES ${src}/ DESTINATION ${dst} TYPE DIRECTORY) +message(STATUS "After Installing") diff --git a/Tests/RunCMake/file/RunCMakeTest.cmake b/Tests/RunCMake/file/RunCMakeTest.cmake index 7b05229..09e3629 100644 --- a/Tests/RunCMake/file/RunCMakeTest.cmake +++ b/Tests/RunCMake/file/RunCMakeTest.cmake @@ -1,3 +1,4 @@ include(RunCMake) +run_cmake(INSTALL-DIRECTORY) run_cmake(FileOpenFailRead) diff --git a/Tests/RunCMake/file/dir/empty.txt b/Tests/RunCMake/file/dir/empty.txt new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Tests/RunCMake/file/dir/empty.txt |