Merge topic 'cpack-package-empty-dirs'

b761e90d CPack: remove accidental changes

Source/CPack/cmCPackGenerator.cxx

@@ -368,7 +368,6 @@ int cmCPackGenerator::InstallProjectViaInstalledDirectories(
         "- Install directory: " << top << std::endl);
       gl.RecurseOn();
       gl.SetRecurseListDirs(true);
-//      gl.SetRecurseThroughSymlinks(false);
       if ( !gl.FindFiles(findExpr) )
         {
         cmCPackLogger(cmCPackLog::LOG_ERROR,

Tests/RunCMake/CPack/CMakeLists.txt

@@ -8,5 +8,5 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${GENERATOR_TYPE}/${RunCMake_TEST}-specif
   include("${GENERATOR_TYPE}/${RunCMake_TEST}-specifics.cmake")
 endif()
 
-set(CPACK_GENERATOR "${GENERATOR_TYPE};TGZ")
+set(CPACK_GENERATOR "${GENERATOR_TYPE}")
 include(CPack)