diff options
author | Brad King <brad.king@kitware.com> | 2015-09-25 15:52:32 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2015-09-25 15:55:59 (GMT) |
commit | 4fa1755315860eb4103971be0d950812b27a85c2 (patch) | |
tree | 9272bb0516d13a108a3b38a072ec3ae400d0f111 /Source/cmSystemTools.cxx | |
parent | b761e90d70435ce55d5e69addfb90ffcd18bd652 (diff) | |
download | CMake-4fa1755315860eb4103971be0d950812b27a85c2.zip CMake-4fa1755315860eb4103971be0d950812b27a85c2.tar.gz CMake-4fa1755315860eb4103971be0d950812b27a85c2.tar.bz2 |
Revert topic 'cpack-package-empty-dirs'
The changes in commit 47b060ae (CPackDeb: allow empty directories in
component packages, 2015-09-21), commit b58de9fe (CPack: allow packaging
of empty directories, 2015-09-21), and commit b761e90d (CPack: remove
accidental changes, 2015-09-22) regressed packaging of CMake itself.
Revert the changes until they can be revised and rebased on other
changes that make additional fixes.
Diffstat (limited to 'Source/cmSystemTools.cxx')
-rw-r--r-- | Source/cmSystemTools.cxx | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index c24b5ea..2675066 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -895,33 +895,12 @@ std::string cmSystemTools::FileExistsInParentDirectories(const char* fname, bool cmSystemTools::cmCopyFile(const char* source, const char* destination) { - // FIXME remove if statement once kwsys SystemTools get support for - // source is directory handling in CopyFileAlways function - if(cmSystemTools::FileIsDirectory(source)) - { - return Superclass::MakeDirectory(destination); - } - return Superclass::CopyFileAlways(source, destination); } bool cmSystemTools::CopyFileIfDifferent(const char* source, const char* destination) { - // FIXME remove if statement once kwsys SystemTools get support for - // source is directory handling in CopyFileIfDifferent function - if(cmSystemTools::FileIsDirectory(source)) - { - if(SystemTools::FileExists(destination)) - { - return true; - } - else - { - return Superclass::MakeDirectory(destination); - } - } - return Superclass::CopyFileIfDifferent(source, destination); } |