[Cmake-commits] CMake branch, next, updated. v3.3.2-3213-g24fca85

[Brad King]

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  24fca85c8985c8e72da36dad2f6296ba89a3c427 (commit)
       via  b761e90d70435ce55d5e69addfb90ffcd18bd652 (commit)
      from  0cea45e48783bb37d60f067c0e6a658b7ac84757 (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=24fca85c8985c8e72da36dad2f6296ba89a3c427
commit 24fca85c8985c8e72da36dad2f6296ba89a3c427
Merge: 0cea45e b761e90
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 23 09:18:11 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 23 09:18:11 2015 -0400

    Merge topic 'cpack-package-empty-dirs' into next
    
    b761e90d CPack: remove accidental changes


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b761e90d70435ce55d5e69addfb90ffcd18bd652
commit b761e90d70435ce55d5e69addfb90ffcd18bd652
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Sep 22 17:38:31 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 23 09:15:57 2015 -0400

    CPack: remove accidental changes
    
    Remove changes accidentally included in commit b58de9fe (CPack: allow
    packaging of empty directories, 2015-09-22).

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:


hooks/post-receive
-- 
CMake