diff options
| author | Raffi Enficiaud <raffi.enficiaud@mines-paris.org> | 2015-09-21 23:57:44 (GMT) |
|---|---|---|
| committer | Domen Vrankar <domen.vrankar@gmail.com> | 2015-09-21 23:57:44 (GMT) |
| commit | 47b060aee0871bdb5fea63b398a1f1cb07fa3b37 (patch) | |
| tree | ab90acc14850556e376b8d8733699341c3428152 | |
| parent | cec45e27f6dc2657b00902bcaef5bd93ae16ead7 (diff) | |
| download | CMake-47b060aee0871bdb5fea63b398a1f1cb07fa3b37.zip CMake-47b060aee0871bdb5fea63b398a1f1cb07fa3b37.tar.gz CMake-47b060aee0871bdb5fea63b398a1f1cb07fa3b37.tar.bz2 | |
CPackDeb: allow empty directories in component packages
| -rw-r--r-- | Source/CPack/cmCPackDebGenerator.cxx | 2 | ||||
| -rw-r--r-- | Tests/CPackComponentsDEB/CMakeLists.txt | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index 5cdab52..93c94e2 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -95,6 +95,7 @@ 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, @@ -222,6 +223,7 @@ int cmCPackDebGenerator::PackageComponentsAllInOne() std::string findExpr(this->GetOption("GEN_WDIR")); findExpr += "/*"; gl.RecurseOn(); + gl.SetRecurseListDirs(true); if ( !gl.FindFiles(findExpr) ) { cmCPackLogger(cmCPackLog::LOG_ERROR, diff --git a/Tests/CPackComponentsDEB/CMakeLists.txt b/Tests/CPackComponentsDEB/CMakeLists.txt index 98ed911..093b23f 100644 --- a/Tests/CPackComponentsDEB/CMakeLists.txt +++ b/Tests/CPackComponentsDEB/CMakeLists.txt @@ -110,9 +110,8 @@ install(FILES ${CPackComponentsDEB_BINARY_DIR}/symtest if(EXISTS "./dirtest") execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory ./dirtest) endif() +# NOTE: directory left empty on purpose execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ./dirtest) -# BUG: apparently cannot add an empty directory -execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ../mylibapp ./dirtest/symtest) # NOTE: we should not add the trailing "/" to dirtest install(DIRECTORY ${CPackComponentsDEB_BINARY_DIR}/dirtest DESTINATION bin/ |