From 6fe7a25b0db0c4b59ca32440eb4f09a860f8453d Mon Sep 17 00:00:00 2001
From: Mario Lang <mlang@delysid.org>
Date: Thu, 29 Mar 2012 16:18:42 +0200
Subject: [PATCH 1/2] cmCPackTXZGenerator: Add tar.xz archive generation.

---
 Source/CMakeLists.txt                    |    1 +
 Source/CPack/cmCPackGeneratorFactory.cxx |    3 ++
 Source/CPack/cmCPackTXZGenerator.cxx     |   25 ++++++++++++++++++++++
 Source/CPack/cmCPackTXZGenerator.h       |   34 ++++++++++++++++++++++++++++++
 Utilities/cmlibarchive/CMakeLists.txt    |    3 --
 5 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 Source/CPack/cmCPackTXZGenerator.cxx
 create mode 100644 Source/CPack/cmCPackTXZGenerator.h

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index f9d1c03..f97c09d 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -479,6 +479,7 @@ SET(CPACK_SRCS
   CPack/cmCPackSTGZGenerator.cxx
   CPack/cmCPackTGZGenerator.cxx
   CPack/cmCPackTarBZip2Generator.cxx
+  CPack/cmCPackTXZGenerator.cxx
   CPack/cmCPackTarCompressGenerator.cxx
   CPack/cmCPackZIPGenerator.cxx
   CPack/cmCPackDocumentVariables.cxx
diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx b/Source/CPack/cmCPackGeneratorFactory.cxx
index a04b403..ce9d72b 100644
--- a/Source/CPack/cmCPackGeneratorFactory.cxx
+++ b/Source/CPack/cmCPackGeneratorFactory.cxx
@@ -15,6 +15,7 @@
 #include "cmCPackGenerator.h"
 #include "cmCPackTGZGenerator.h"
 #include "cmCPackTarBZip2Generator.h"
+#include "cmCPackTXZGenerator.h"
 #include "cmCPackTarCompressGenerator.h"
 #include "cmCPackZIPGenerator.h"
 #include "cmCPackSTGZGenerator.h"
@@ -60,6 +61,8 @@ cmCPackGeneratorFactory::cmCPackGeneratorFactory()
     cmCPackZIPGenerator::CreateGenerator);
   this->RegisterGenerator("TBZ2", "Tar BZip2 compression",
     cmCPackTarBZip2Generator::CreateGenerator);
+  this->RegisterGenerator("TXZ", "Tar XZ compression",
+    cmCPackTXZGenerator::CreateGenerator);
   this->RegisterGenerator("TZ", "Tar Compress compression",
     cmCPackTarCompressGenerator::CreateGenerator);
 #ifdef __APPLE__
diff --git a/Source/CPack/cmCPackTXZGenerator.cxx b/Source/CPack/cmCPackTXZGenerator.cxx
new file mode 100644
index 0000000..9fe78c1
--- /dev/null
+++ b/Source/CPack/cmCPackTXZGenerator.cxx
@@ -0,0 +1,25 @@
+/*============================================================================
+  CMake - Cross Platform Makefile Generator
+  Copyright 2000-2012 Kitware, Inc., Insight Software Consortium
+
+  Distributed under the OSI-approved BSD License (the "License");
+  see accompanying file Copyright.txt for details.
+
+  This software is distributed WITHOUT ANY WARRANTY; without even the
+  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the License for more information.
+============================================================================*/
+
+#include "cmCPackTXZGenerator.h"
+//----------------------------------------------------------------------
+cmCPackTXZGenerator::cmCPackTXZGenerator() 
+ :cmCPackArchiveGenerator(cmArchiveWrite::CompressXZ,
+                          cmArchiveWrite::TypeTAR)
+{
+}
+
+//----------------------------------------------------------------------
+cmCPackTXZGenerator::~cmCPackTXZGenerator()
+{
+}
+
diff --git a/Source/CPack/cmCPackTXZGenerator.h b/Source/CPack/cmCPackTXZGenerator.h
new file mode 100644
index 0000000..b4b8636
--- /dev/null
+++ b/Source/CPack/cmCPackTXZGenerator.h
@@ -0,0 +1,34 @@
+/*============================================================================
+  CMake - Cross Platform Makefile Generator
+  Copyright 2000-2012 Kitware, Inc.
+
+  Distributed under the OSI-approved BSD License (the "License");
+  see accompanying file Copyright.txt for details.
+
+  This software is distributed WITHOUT ANY WARRANTY; without even the
+  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the License for more information.
+============================================================================*/
+
+#ifndef cmCPackTXZGenerator_h
+#define cmCPackTXZGenerator_h
+
+#include "cmCPackArchiveGenerator.h"
+
+/** \class cmCPackTarBZip2Generator
+ * \brief A generator for TXZ files
+ */
+class cmCPackTXZGenerator : public cmCPackArchiveGenerator
+{
+public:
+  cmCPackTypeMacro(cmCPackTXZGenerator, cmCPackArchiveGenerator);
+  /**
+   * Construct generator
+   */
+  cmCPackTXZGenerator();
+  virtual ~cmCPackTXZGenerator();
+protected:
+  virtual const char* GetOutputExtension() { return ".tar.xz"; }
+};
+
+#endif
diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
index 7f7a69f..b4e58cf 100644
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -196,8 +196,6 @@ ENDIF(BZIP2_FOUND)
 MARK_AS_ADVANCED(CLEAR BZIP2_INCLUDE_DIR)
 MARK_AS_ADVANCED(CLEAR BZIP2_LIBRARY)
 
-IF(0) # CMake does not need LZMA support in libarchive
-#
 # Find LZMA
 #
 FIND_PACKAGE(LZMA)
@@ -212,7 +210,6 @@ ELSEIF(LZMADEC_FOUND)
   INCLUDE_DIRECTORIES(${LZMADEC_INCLUDE_DIR})
   LIST(APPEND ADDITIONAL_LIBS ${LZMADEC_LIBRARIES})
 ENDIF(LZMA_FOUND)
-ENDIF()
 
 #
 # Check headers
-- 
1.7.9.1

From 73cd104db5705442a124e2b89a3ddda4e21ab25d Mon Sep 17 00:00:00 2001
From: Mario Lang <mlang@delysid.org>
Date: Thu, 29 Mar 2012 16:20:14 +0200
Subject: [PATCH 2/2] Add CPACK_BINARY_TXZ and CPACK_SOURCE_TXZ options.

---
 Modules/CPack.cmake |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index 571770e..61a6337 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -419,6 +419,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)
@@ -439,6 +440,7 @@ 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_ZIP          ZIP)
   
@@ -450,6 +452,7 @@ if(NOT CPACK_SOURCE_GENERATOR)
     if(CYGWIN)
       option(CPACK_SOURCE_CYGWIN "Enable to build Cygwin source packages" ON)
     else(CYGWIN)
+      option(CPACK_SOURCE_TXZ  "Enable to build TXZ source packages" OFF)
       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_TZ   "Enable to build TZ source packages"   ON)
@@ -462,6 +465,7 @@ if(NOT CPACK_SOURCE_GENERATOR)
   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)
 endif(NOT CPACK_SOURCE_GENERATOR)
-- 
1.7.9.1