diff options
| author | Brad King <brad.king@kitware.com> | 2021-08-03 15:03:58 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-08-03 15:04:27 (GMT) |
| commit | ff56e78bea3a9c05e0a1ce3d128a0aad0849c1ac (patch) | |
| tree | b1bb2663217b878910f6226b8e02a04f6cd4c5a7 | |
| parent | 6edf3133addf54692ac4b89eb2c63b66b87d2ebe (diff) | |
| parent | 051da997da6344a33145e7c370e336dfc1e8fb09 (diff) | |
| download | CMake-ff56e78bea3a9c05e0a1ce3d128a0aad0849c1ac.zip CMake-ff56e78bea3a9c05e0a1ce3d128a0aad0849c1ac.tar.gz CMake-ff56e78bea3a9c05e0a1ce3d128a0aad0849c1ac.tar.bz2 | |
Merge topic 'cpack_deb_zstd'
051da997da CPack/DEB: Add zstd compression for deb packages
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Hirsch <michael@scivision.dev>
Merge-request: !6394
| -rw-r--r-- | Help/cpack_gen/deb.rst | 21 | ||||
| -rw-r--r-- | Help/release/dev/cpack-deb-add-zstd-compression.rst | 6 | ||||
| -rw-r--r-- | Source/CPack/cmCPackDebGenerator.cxx | 3 |
3 files changed, 26 insertions, 4 deletions
diff --git a/Help/cpack_gen/deb.rst b/Help/cpack_gen/deb.rst index c0d9c3d..f96ca32 100644 --- a/Help/cpack_gen/deb.rst +++ b/Help/cpack_gen/deb.rst @@ -274,10 +274,23 @@ List of CPack DEB generator specific variables: Possible values are: - - lzma - - xz - - bzip2 - - gzip + ``lzma`` + Lempel–Ziv–Markov chain algorithm + + ``xz`` + XZ Utils compression + + ``bzip2`` + bzip2 Burrows–Wheeler algorithm + + ``gzip`` + GNU Gzip compression + + ``zstd`` + .. versionadded:: 3.22 + + Zstandard compression + .. variable:: CPACK_DEBIAN_PACKAGE_PRIORITY CPACK_DEBIAN_<COMPONENT>_PACKAGE_PRIORITY diff --git a/Help/release/dev/cpack-deb-add-zstd-compression.rst b/Help/release/dev/cpack-deb-add-zstd-compression.rst new file mode 100644 index 0000000..a138455 --- /dev/null +++ b/Help/release/dev/cpack-deb-add-zstd-compression.rst @@ -0,0 +1,6 @@ +cpack-deb-add-zstd-compression +------------------------------ + +* The :cpack_gen:`CPack DEB Generator` gained the + option to set :variable:`CPACK_DEBIAN_COMPRESSION_TYPE` to zstd, + which enables Zstandard compression for deb packages. diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index 5b03185..5f0f153 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -111,6 +111,9 @@ DebGenerator::DebGenerator( } else if (!std::strcmp(debianCompressionType, "gzip")) { this->CompressionSuffix = ".gz"; this->TarCompressionType = cmArchiveWrite::CompressGZip; + } else if (!std::strcmp(debianCompressionType, "zstd")) { + this->CompressionSuffix = ".zst"; + this->TarCompressionType = cmArchiveWrite::CompressZstd; } else if (!std::strcmp(debianCompressionType, "none")) { this->CompressionSuffix.clear(); this->TarCompressionType = cmArchiveWrite::CompressNone; |