From b761e90d70435ce55d5e69addfb90ffcd18bd652 Mon Sep 17 00:00:00 2001 From: Domen Vrankar Date: Tue, 22 Sep 2015 17:38:31 +0200 Subject: CPack: remove accidental changes Remove changes accidentally included in commit b58de9fe (CPack: allow packaging of empty directories, 2015-09-22). --- Source/CPack/cmCPackGenerator.cxx | 1 - Tests/RunCMake/CPack/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index aa4f181..04b1976 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/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, diff --git a/Tests/RunCMake/CPack/CMakeLists.txt b/Tests/RunCMake/CPack/CMakeLists.txt index 449172a..46f1367 100644 --- a/Tests/RunCMake/CPack/CMakeLists.txt +++ b/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) -- cgit v0.12