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/CPack/cmCPackDebGenerator.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/CPack/cmCPackDebGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackDebGenerator.cxx | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index 93c94e2..5cdab52 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -95,7 +95,6 @@ int cmCPackDebGenerator::PackageOnePack(std::string initialTopLevel, std::string findExpr(this->GetOption("GEN_WDIR")); findExpr += "/*"; gl.RecurseOn(); - gl.SetRecurseListDirs(true); if ( !gl.FindFiles(findExpr) ) { cmCPackLogger(cmCPackLog::LOG_ERROR, @@ -223,7 +222,6 @@ int cmCPackDebGenerator::PackageComponentsAllInOne() std::string findExpr(this->GetOption("GEN_WDIR")); findExpr += "/*"; gl.RecurseOn(); - gl.SetRecurseListDirs(true); if ( !gl.FindFiles(findExpr) ) { cmCPackLogger(cmCPackLog::LOG_ERROR, |