[Cmake-commits] CMake branch, next, updated. v3.3.2-3197-geb99bf2

[Domen Vrankar]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  eb99bf2d6861ba6cfc282265a5947453032c68dc (commit)
       via  be4dc65ba74a26d742558a0e05e4748b18f4b4aa (commit)
      from  da0bdab6d9788728bf0671b22a287dd1b5517f42 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb99bf2d6861ba6cfc282265a5947453032c68dc
commit eb99bf2d6861ba6cfc282265a5947453032c68dc
Merge: da0bdab be4dc65
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Sep 22 11:39:06 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 22 11:39:06 2015 -0400

    Merge topic 'cpack-package-empty-dirs-cleanup' into next
    
    be4dc65b remove parts that were pushed by accident


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be4dc65ba74a26d742558a0e05e4748b18f4b4aa
commit be4dc65ba74a26d742558a0e05e4748b18f4b4aa
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Sep 22 17:38:31 2015 +0200
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Tue Sep 22 17:38:31 2015 +0200

    remove parts that were pushed by accident

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)

-----------------------------------------------------------------------

Summary of changes:
 Source/CPack/cmCPackGenerator.cxx   |    1 -
 Tests/RunCMake/CPack/CMakeLists.txt |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)


hooks/post-receive
-- 
CMake