diff options
author | Brad King <brad.king@kitware.com> | 2014-07-31 13:17:45 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-07-31 13:17:45 (GMT) |
commit | b056b8c46ced8160190a73a3ecf73606086cf17a (patch) | |
tree | 498f41639805b320d419bb7fd57ea17df7d94f1b | |
parent | ba53bc5a9dd65c4525e0e9e4af86c595710094e0 (diff) | |
parent | 9d93e099e65a01dd9c2e4c560c334dd4f09e2b63 (diff) | |
download | CMake-b056b8c46ced8160190a73a3ecf73606086cf17a.zip CMake-b056b8c46ced8160190a73a3ecf73606086cf17a.tar.gz CMake-b056b8c46ced8160190a73a3ecf73606086cf17a.tar.bz2 |
Merge topic 'cpack-add-lzma-package-options'
9d93e099 CPack: Add lzma-compressed package options
-rw-r--r-- | Modules/CPack.cmake | 10 |
1 files changed, 10 insertions, 0 deletions
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 |