kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'cpack-package-empty-dirs' 

b761e90d CPack: remove accidental changes
This commit is contained in:
Brad King 2015-09-23 09:22:59 -04:00 committed by CMake Topic Stage
parent 20ed8bbd02 b761e90d70
commit 3779716616
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/CPack/cmCPackGenerator.cxx
View File

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

2
Tests/RunCMake/CPack/CMakeLists.txt
View File

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