[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1006-g35e7c94

[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  35e7c9497a522f699b4f3145eeb611ec4d028bd8 (commit)
       via  7096885d78be9152cc3dd7e5cb697417b59981ce (commit)
      from  fb049c818beeb339cf01c796449c3837021dfca0 (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=35e7c9497a522f699b4f3145eeb611ec4d028bd8
commit 35e7c9497a522f699b4f3145eeb611ec4d028bd8
Merge: fb049c8 7096885
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 13 18:23:39 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 13 18:23:39 2014 -0400

    Merge topic 'cpack-deb-compression-types' into next
    
    7096885d CPackDeb: Default to gzip compression


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7096885d78be9152cc3dd7e5cb697417b59981ce
commit 7096885d78be9152cc3dd7e5cb697417b59981ce
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 13 18:22:07 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 13 18:22:40 2014 -0400

    CPackDeb: Default to gzip compression
    
    If a project unsets "CPACK_DEBIAN_COMPRESSION_TYPE" then use 'gzip'
    by default.

diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index dabc928..936942b 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -406,6 +406,10 @@ int cmCPackDebGenerator::createDeb()
 
   const char* debian_compression_type =
       this->GetOption("CPACK_DEBIAN_COMPRESSION_TYPE");
+  if(!debian_compression_type)
+    {
+    debian_compression_type = "gzip";
+    }
 
   std::string cmake_tar = " ", compression_modifier = "a", compression_suffix;
   if(!strcmp(debian_compression_type, "lzma")) {

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

Summary of changes:
 Source/CPack/cmCPackDebGenerator.cxx |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake