[Cmake-commits] CMake branch, next, updated. v3.0.0-4655-gf41d04e

[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  f41d04eceea40e9f35802338a5e0e129c31a83a8 (commit)
       via  9d93e099e65a01dd9c2e4c560c334dd4f09e2b63 (commit)
      from  ea27d5ac34e10842b04cb8533d6688f93e736b9d (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=f41d04eceea40e9f35802338a5e0e129c31a83a8
commit f41d04eceea40e9f35802338a5e0e129c31a83a8
Merge: ea27d5a 9d93e09
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 30 15:57:05 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 30 15:57:05 2014 -0400

    Merge topic 'cpack-add-lzma-package-options' into next
    
    9d93e099 CPack: Add lzma-compressed package options


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d93e099e65a01dd9c2e4c560c334dd4f09e2b63
commit 9d93e099e65a01dd9c2e4c560c334dd4f09e2b63
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Wed Jul 30 21:42:56 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 30 15:56:34 2014 -0400

    CPack: Add lzma-compressed package options
    
    Add options to package binary and source tarballs:
    
     CPACK_BINARY_7Z
     CPACK_BINARY_TXZ
     CPACK_SOURCE_7Z
     CPACK_SOURCE_TXZ

diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index b58f944..8b07cea 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -426,6 +426,7 @@ if(NOT CPACK_GENERATOR)
       option(CPACK_BINARY_STGZ "Enable to build STGZ packages"    ON)
       option(CPACK_BINARY_TGZ  "Enable to build TGZ packages"     ON)
       option(CPACK_BINARY_TBZ2 "Enable to build TBZ2 packages"    OFF)
+      option(CPACK_BINARY_TXZ  "Enable to build TXZ packages"     OFF)
       option(CPACK_BINARY_DEB  "Enable to build Debian packages"  OFF)
       option(CPACK_BINARY_RPM  "Enable to build RPM packages"     OFF)
       option(CPACK_BINARY_NSIS "Enable to build NSIS packages"    OFF)
@@ -434,6 +435,7 @@ if(NOT CPACK_GENERATOR)
     option(CPACK_BINARY_NSIS "Enable to build NSIS packages" ON)
     option(CPACK_BINARY_WIX  "Enable to build WiX packages" OFF)
     option(CPACK_BINARY_ZIP  "Enable to build ZIP packages" OFF)
+    option(CPACK_BINARY_7Z   "Enable to build 7-Zip packages" OFF)
   endif()
   option(CPACK_BINARY_IFW "Enable to build IFW packages" OFF)
 
@@ -448,10 +450,12 @@ if(NOT CPACK_GENERATOR)
   cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_STGZ         STGZ)
   cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_TGZ          TGZ)
   cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_TBZ2         TBZ2)
+  cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_TXZ          TXZ)
   cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_TZ           TZ)
   cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_WIX          WIX)
   cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_ZIP          ZIP)
   cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_IFW          IFW)
+  cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_7Z           7Z)
 
 endif()
 
@@ -463,26 +467,32 @@ if(NOT CPACK_SOURCE_GENERATOR)
     else()
       option(CPACK_SOURCE_TBZ2 "Enable to build TBZ2 source packages" ON)
       option(CPACK_SOURCE_TGZ  "Enable to build TGZ source packages"  ON)
+      option(CPACK_SOURCE_TXZ  "Enable to build TXZ source packages"  ON)
       option(CPACK_SOURCE_TZ   "Enable to build TZ source packages"   ON)
       option(CPACK_SOURCE_ZIP  "Enable to build ZIP source packages"  OFF)
     endif()
   else()
     option(CPACK_SOURCE_ZIP "Enable to build ZIP source packages" ON)
+    option(CPACK_SOURCE_7Z  "Enable to build 7-Zip source packages" ON)
   endif()
 
   cpack_optional_append(CPACK_SOURCE_GENERATOR  CPACK_SOURCE_CYGWIN  CygwinSource)
   cpack_optional_append(CPACK_SOURCE_GENERATOR  CPACK_SOURCE_TGZ     TGZ)
   cpack_optional_append(CPACK_SOURCE_GENERATOR  CPACK_SOURCE_TBZ2    TBZ2)
+  cpack_optional_append(CPACK_SOURCE_GENERATOR  CPACK_SOURCE_TXZ     TXZ)
   cpack_optional_append(CPACK_SOURCE_GENERATOR  CPACK_SOURCE_TZ      TZ)
   cpack_optional_append(CPACK_SOURCE_GENERATOR  CPACK_SOURCE_ZIP     ZIP)
+  cpack_optional_append(CPACK_SOURCE_GENERATOR  CPACK_SOURCE_7Z      7Z)
 endif()
 
 # mark the above options as advanced
 mark_as_advanced(CPACK_BINARY_CYGWIN CPACK_BINARY_PACKAGEMAKER CPACK_BINARY_OSXX11
                  CPACK_BINARY_STGZ   CPACK_BINARY_TGZ          CPACK_BINARY_TBZ2
                  CPACK_BINARY_DEB    CPACK_BINARY_RPM          CPACK_BINARY_TZ
+                 CPACK_BINARY_TXZ    CPACK_BINARY_7Z
                  CPACK_BINARY_NSIS CPACK_BINARY_WIX CPACK_BINARY_ZIP CPACK_BINARY_BUNDLE
                  CPACK_SOURCE_CYGWIN CPACK_SOURCE_TBZ2 CPACK_SOURCE_TGZ
+                 CPACK_SOURCE_TXZ    CPACK_SOURCE_7Z
                  CPACK_SOURCE_TZ CPACK_SOURCE_ZIP CPACK_BINARY_DRAGNDROP)
 
 # Set some other variables

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

Summary of changes:
 Modules/CPack.cmake |   10 ++++++++++
 1 file changed, 10 insertions(+)


hooks/post-receive
-- 
CMake