summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-04-26 15:33:39 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-04-26 15:33:49 (GMT)
commit3c1655936fec54e76d6f92ab6d37e2104db44699 (patch)
tree7e019253de87fa29873d9dcfde8acb996a7cb82b /Help
parente69a3287256d5fb7f6f2a150f5e96ff7bcb0d9b7 (diff)
parentc5c130e675624eef03f5bcaf848810659e205ed2 (diff)
downloadCMake-3c1655936fec54e76d6f92ab6d37e2104db44699.zip
CMake-3c1655936fec54e76d6f92ab6d37e2104db44699.tar.gz
CMake-3c1655936fec54e76d6f92ab6d37e2104db44699.tar.bz2
Merge topic 'lzma-threads'
c5c130e675 cmArchiveWrite: Consolidate multiple ways to set thread count 5380d858ff liblzma: Enable multi threaded stream encoding support e9065e96dc Merge branch 'upstream-liblzma' into lzma-threads ee909a8e8b liblzma 2020-03-17 (2327a461) 741b85b42b liblzma: Revise update script to get version 5.2.5 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6014
Diffstat (limited to 'Help')
-rw-r--r--Help/cpack_gen/archive.rst7
-rw-r--r--Help/release/dev/lzma-threads.rst7
2 files changed, 11 insertions, 3 deletions
diff --git a/Help/cpack_gen/archive.rst b/Help/cpack_gen/archive.rst
index b941812..47e8e13 100644
--- a/Help/cpack_gen/archive.rst
+++ b/Help/cpack_gen/archive.rst
@@ -82,7 +82,8 @@ CPack generators which are essentially archives at their core. These include:
See also the :variable:`CPACK_THREADS` variable.
-.. note::
+ .. versionadded:: 3.21
- Official CMake binaries available on ``cmake.org`` ship with a ``liblzma``
- that does not support parallel compression.
+ Official CMake binaries available on ``cmake.org`` now ship
+ with a ``liblzma`` that supports parallel compression.
+ Older versions did not.
diff --git a/Help/release/dev/lzma-threads.rst b/Help/release/dev/lzma-threads.rst
new file mode 100644
index 0000000..a481cfa
--- /dev/null
+++ b/Help/release/dev/lzma-threads.rst
@@ -0,0 +1,7 @@
+lzma-threads
+------------
+
+* The precompiled binaries provided on
+ `cmake.org <https://cmake.org/download/>`_ now support
+ ``liblzma`` multi-threading. See the :variable:`CPACK_THREADS` and
+ :variable:`CPACK_ARCHIVE_THREADS` variables.