diff options
| author | Brad King <brad.king@kitware.com> | 2015-09-23 13:22:59 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-09-23 13:22:59 (GMT) |
| commit | 377971661609607dd2c4bd66166c655371d70820 (patch) | |
| tree | 5cb5b188b5ddce779aabc0149268d5b3e2832d29 | |
| parent | 20ed8bbd025de9af4d28979f95254018a64c129f (diff) | |
| parent | b761e90d70435ce55d5e69addfb90ffcd18bd652 (diff) | |
| download | CMake-377971661609607dd2c4bd66166c655371d70820.zip CMake-377971661609607dd2c4bd66166c655371d70820.tar.gz CMake-377971661609607dd2c4bd66166c655371d70820.tar.bz2 | |
Merge topic 'cpack-package-empty-dirs'
b761e90d CPack: remove accidental changes
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/CPack/CMakeLists.txt | 2 |
2 files changed, 1 insertions, 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) |