[Cmake-commits] CMake branch, master, updated. v3.14.4-1170-gebee9ff
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, master has been updated via ebee9ff160569481aed4e0db5cbb3f3ac925c044 (commit) from c0b560f6641ab406894864c2534740bd1fd538a4 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ebee9ff160569481aed4e0db5cbb3f3ac925c044 commit ebee9ff160569481aed4e0db5cbb3f3ac925c044 Author: Kitware Robot AuthorDate: Fri May 31 00:01:06 2019 -0400 Commit: Kitware Robot CommitDate: Fri May 31 00:01:06 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 63f1dce..a3d46bc 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 14) -set(CMake_VERSION_PATCH 20190530) +set(CMake_VERSION_PATCH 20190531) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.14.4-1169-gc0b560f
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, master has been updated
via c0b560f6641ab406894864c2534740bd1fd538a4 (commit)
via b410dd5a05c83b7728a9c4501d5ca5bf7d11822c (commit)
via 06434fc2748f241eb6d89ffd2c0c66fb95dba9cb (commit)
from 7a8a24d0284856b7b38037884d0b17a1de7a9926 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c0b560f6641ab406894864c2534740bd1fd538a4
commit c0b560f6641ab406894864c2534740bd1fd538a4
Merge: 7a8a24d b410dd5
Author: Brad King
AuthorDate: Thu May 30 18:13:25 2019 +
Commit: Kitware Robot
CommitDate: Thu May 30 14:14:22 2019 -0400
Merge topic 'update-vim-syntax'
b410dd5a05 Merge branch 'upstream-vim-cmake-syntax' into update-vim-syntax
06434fc274 vim-cmake-syntax 2019-05-29 (c42ede9f)
Acked-by: Kitware Robot
Merge-request: !3394
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b410dd5a05c83b7728a9c4501d5ca5bf7d11822c
commit b410dd5a05c83b7728a9c4501d5ca5bf7d11822c
Merge: 067a4f4 06434fc
Author: Patrick Boettcher
AuthorDate: Wed May 29 16:58:06 2019 +0200
Commit: Brad King
CommitDate: Wed May 29 11:57:17 2019 -0400
Merge branch 'upstream-vim-cmake-syntax' into update-vim-syntax
* upstream-vim-cmake-syntax:
vim-cmake-syntax 2019-05-29 (c42ede9f)
diff --cc Auxiliary/vim/syntax/cmake.vim
index 877a033,50d503b..cd8385b
--- a/Auxiliary/vim/syntax/cmake.vim
+++ b/Auxiliary/vim/syntax/cmake.vim
@@@ -2219,10 -2975,13 +2975,15 @@@ syn keyword cmakeGeneratorExpressions c
\ C_COMPILER_VERSION
\ C_STANDARD
\ DEBUG_MODE
+ \ DEBUG_POSTFIX
+ \ EXCLUDE
\ EXPORT
+ \ FALSE
+ \ FILTER
\ FOO_EXTRA_THINGS
+\ Fortran_COMPILER_ID
+\ Fortran_COMPILER_VERSION
+ \ GENERATE
\ GENEX_EVAL
\ GNU
\ IF
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=06434fc2748f241eb6d89ffd2c0c66fb95dba9cb
commit 06434fc2748f241eb6d89ffd2c0c66fb95dba9cb
Author: vim-cmake-syntax upstream
AuthorDate: Wed May 29 16:48:23 2019 +0200
Commit: Brad King
CommitDate: Wed May 29 11:53:59 2019 -0400
vim-cmake-syntax 2019-05-29 (c42ede9f)
Code extracted from:
https://github.com/pboettch/vim-cmake-syntax.git
at commit c42ede9f70e53a69f98e5bc5df16f834937dd37c (master).
Upstream Shortlog
-
Patrick Boettcher (6):
4e657a05 update to cmake version 3.13.20181220-g0495c
b0ada6e2 add -replacing in variables.
60654a65 Update keywords for version 3.14.20190402-g56ae2
33e512bd format brace-encapsulated variables (varname from var)
a3628ebb fix keywords of generator-expressions wrongly colored in
simple arguments
c42ede9f update to cmake version 3.14.20190529-g067a4f
diff --git a/cmake.vim.in b/cmake.vim.in
index 77ad3d8..3471b54 100644
--- a/cmake.vim.in
+++ b/cmake.vim.in
@@ -31,11 +31,11 @@ syn region cmakeGeneratorExpression start="$<" end=">"
contained oneline contain
syn region cmakeString start='"' end='"' contained
contains=cmakeTodo,cmakeVariableValue,cmakeEscaped
-syn region cmakeVariableValue start="${" end="}" contained oneline
contains=cmakeVariable,cmakeTodo
+syn region cmakeVariableValue start="${" end="}" contained oneline
contains=cmakeVariable,cmakeTodo,cmakeVariableValue
syn region cmakeEnvironment start="$ENV{" end="}" contained oneline
contains=cmakeTodo
-syn region cmakeArguments start="(" end=")"
contains=ALLBUT,cmakeCommand,cmakeCommandConditional,cmakeCommandRepeat,cmakeCommandDeprecated,cmakeCommandManuallyAdded,cmakeArguments,cmakeTodo
+syn region cmakeArguments start="(" end=")"
contains=ALLBUT,cmakeGeneratorExpressions,cmakeCommand,cmakeCommandConditional,cmakeCommandRepeat,cmakeCommandDeprecated,cmakeCommandManuallyAdded,cmakeArguments,cmakeTodo
syn case match
diff --git a/extract-upper-case.pl b/extract-upper-case.pl
index bd62ade..204b496 100755
--- a/extract-upper-case.pl
+++ b/extract-upper-case.pl
@@ -13,6 +13,9 @@ my @properties;
my @modules;
my %keywords; # command => keyword-list
+# find cmake/Modules/ | sed -rn 's/.*CMakeDetermine(.+)Compiler.cmake/\1/p' |
sort
+my @languages = qw(ASM ASM_MASM ASM_NASM C CSharp CUDA CXX Fortran Java RC
Swift);
+
# unwanted upper-cases
my %unwanted = map { $_ => 1 } qw(VS CXX IDE NOTFOUND NO_ DFOO DBAR NEW);
# cannot remove ALL - exists for add_custom_command
@@ -30,8 +33,21 @@ push @modules, "ExternalProject";
# variables
[Cmake-commits] CMake branch, master, updated. v3.14.4-1166-g7a8a24d
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, master has been updated
via 7a8a24d0284856b7b38037884d0b17a1de7a9926 (commit)
via 35bfc85d95a480f0b0b6f22d764e06672cd8d6ac (commit)
from 5bb1e9a382f7ed4d42e799581acaa63a909b7b5a (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a8a24d0284856b7b38037884d0b17a1de7a9926
commit 7a8a24d0284856b7b38037884d0b17a1de7a9926
Merge: 5bb1e9a 35bfc85
Author: Brad King
AuthorDate: Thu May 30 14:41:04 2019 +
Commit: Kitware Robot
CommitDate: Thu May 30 10:41:14 2019 -0400
Merge topic 'FindBoost-debug-messages'
35bfc85d95 FindBoost: Refactor debug messages
Acked-by: Kitware Robot
Merge-request: !3382
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=35bfc85d95a480f0b0b6f22d764e06672cd8d6ac
commit 35bfc85d95a480f0b0b6f22d764e06672cd8d6ac
Author: Dennis Klein
AuthorDate: Mon May 27 18:05:51 2019 +0200
Commit: Dennis Klein
CommitDate: Tue May 28 20:46:43 2019 +0200
FindBoost: Refactor debug messages
* Deduplicate code with helper functions
* Remove double printing of _boost_TEST_VERSIONS
* Fix #19158
* Add printing of a few additional variables
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 464f229..a059589 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -303,6 +303,56 @@ endif()
# FindBoost functions & macros
#
+#
+# Print debug text if Boost_DEBUG is set.
+# Call example:
+# _Boost_DEBUG_PRINT("${CMAKE_CURRENT_LIST_FILE}" "${CMAKE_CURRENT_LIST_LINE}"
"debug message")
+#
+function(_Boost_DEBUG_PRINT file line text)
+ if(Boost_DEBUG)
+message(STATUS "[ ${file}:${line} ] ${text}")
+ endif()
+endfunction()
+
+#
+# _Boost_DEBUG_PRINT_VAR(file line variable_name [ENVIRONMENT]
+#[SOURCE "short explanation of origin of var value"])
+#
+# ENVIRONMENT - look up environment variable instead of CMake variable
+#
+# Print variable name and its value if Boost_DEBUG is set.
+# Call example:
+# _Boost_DEBUG_PRINT_VAR("${CMAKE_CURRENT_LIST_FILE}"
"${CMAKE_CURRENT_LIST_LINE}" BOOST_ROOT)
+#
+function(_Boost_DEBUG_PRINT_VAR file line name)
+ if(Boost_DEBUG)
+cmake_parse_arguments(_args "ENVIRONMENT" "SOURCE" "" ${ARGN})
+
+unset(source)
+if(_args_SOURCE)
+ set(source " (${_args_SOURCE})")
+endif()
+
+if(_args_ENVIRONMENT)
+ if(DEFINED ENV{${name}})
+set(value "\"$ENV{${name}}\"")
+ else()
+set(value "")
+ endif()
+ set(_name "ENV{${name}}")
+else()
+ if(DEFINED "${name}")
+set(value "\"${${name}}\"")
+ else()
+set(value "")
+ endif()
+ set(_name "${name}")
+endif()
+
+_Boost_DEBUG_PRINT("${file}" "${line}" "${_name} = ${value}${source}")
+ endif()
+endfunction()
+
#
# Check the existence of the libraries.
@@ -420,11 +470,10 @@ macro(_Boost_FIND_LIBRARY var build_type)
# If Boost_LIBRARY_DIR_[RELEASE,DEBUG] is known then search only there.
if(Boost_LIBRARY_DIR_${build_type})
set(_boost_LIBRARY_SEARCH_DIRS_${build_type}
${Boost_LIBRARY_DIR_${build_type}} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}
] "
-" Boost_LIBRARY_DIR_${build_type} = ${Boost_LIBRARY_DIR_${build_type}}"
-" _boost_LIBRARY_SEARCH_DIRS_${build_type} =
${_boost_LIBRARY_SEARCH_DIRS_${build_type}}")
-endif()
+_Boost_DEBUG_PRINT_VAR("${CMAKE_CURRENT_LIST_FILE}"
"${CMAKE_CURRENT_LIST_LINE}"
+ "Boost_LIBRARY_DIR_${build_type}")
+_Boost_DEBUG_PRINT_VAR("${CMAKE_CURRENT_LIST_FILE}"
"${CMAKE_CURRENT_LIST_LINE}"
+ "_boost_LIBRARY_SEARCH_DIRS_${build_type}")
endif()
endmacro()
@@ -560,9 +609,10 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret)
set(_boost_COMPILER "-clang${_boost_COMPILER_VERSION}")
endif()
else()
-# TODO at least Boost_DEBUG here?
set(_boost_COMPILER "")
endif()
+ _Boost_DEBUG_PRINT_VAR("${CMAKE_CURRENT_LIST_FILE}"
"${CMAKE_CURRENT_LIST_LINE}"
+ "_boost_COMPILER" SOURCE "guessed")
set(${_ret} ${_boost_COMPILER} PARENT_SCOPE)
endfunction()
@@ -1222,21 +1272,12 @@ else()
endif()
endif()
-if(Boost_DEBUG)
- # Output some of their choices
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-
[Cmake-commits] CMake branch, master, updated. v3.14.4-1164-g5bb1e9a
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, master has been updated via 5bb1e9a382f7ed4d42e799581acaa63a909b7b5a (commit) via 49f5b6f7bf426d760e6c935f6e8c308d921138a7 (commit) from a6a04cc446e67017e74e294a4aef84e9e8da4323 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5bb1e9a382f7ed4d42e799581acaa63a909b7b5a commit 5bb1e9a382f7ed4d42e799581acaa63a909b7b5a Merge: a6a04cc 49f5b6f Author: Brad King AuthorDate: Thu May 30 14:08:54 2019 + Commit: Kitware Robot CommitDate: Thu May 30 10:09:05 2019 -0400 Merge topic 'doc-mr-resolve-states' 49f5b6f7bf Help: Document the expire and external discussion resolve states Acked-by: Kitware Robot Acked-by: Ben Boeckel Acked-by: Brad King Merge-request: !3377 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49f5b6f7bf426d760e6c935f6e8c308d921138a7 commit 49f5b6f7bf426d760e6c935f6e8c308d921138a7 Author: Craig Scott AuthorDate: Sun May 26 21:23:15 2019 +1000 Commit: Craig Scott CommitDate: Thu May 30 19:45:54 2019 +1000 Help: Document the expire and external discussion resolve states Our practice of closing MRs temporarily while discussion takes place in a separate issue isn't always well understood by MR authors. Expiring a MR seems to be better understood, but making it clear that it is also a temporary state is helpful. diff --git a/Help/dev/review.rst b/Help/dev/review.rst index 1d664c4..cbde6fe 100644 --- a/Help/dev/review.rst +++ b/Help/dev/review.rst @@ -377,7 +377,15 @@ command is needed to stage it again. Resolve === -A MR may be resolved in one of the following ways. +The workflow used by the CMake project supports a number of different +ways in which a MR can be moved to a resolved state. In addition to +the conventional practices of merging or closing a MR without merging it, +a MR can also be moved to a quasi-resolved state pending some action. +This may involve moving discussion to an issue or it may be the result of +an extended period of inactivity. These quasi-resolved states are used +to help manage the relatively large number of MRs the project receives +and are not an indication of the changes being rejected. The following +sections explain the different resolutions a MR may be given. Merge - @@ -433,15 +441,68 @@ Close - If review has concluded that the MR should not be integrated then it -may be closed through GitLab. +may be closed through GitLab. This would normally be a final state +with no expectation that the MR would be re-opened in the future. +It is also used when a MR is being superseded by another separate one, +in which case a reference to the new MR should be added to the MR being +closed. Expire -- If progress on a MR has stalled for a while, it may be closed with a ``workflow:expired`` label and a comment indicating that the MR has -been closed due to inactivity. - -Contributors are welcome to re-open an expired MR when they are ready -to continue work. Please re-open *before* pushing an update to the -MR topic branch to ensure GitLab will still act on the association. +been closed due to inactivity (it may also be done where the MR is blocked +for an extended period by work in a different MR). This is not an +indication that there is a problem with the MR's content, it is only a +practical measure to allow the reviewers to focus attention on MRs that +are actively being worked on. As a guide, the average period of inactivity +before transitioning a MR to the expired state would be around 2 weeks, +but this may decrease to 1 week or less when there is a high number of +open merge requests. + +Reviewers would usually provide a message similar to the following when +resolving a MR as expired:: + + Closing for now. @ please re-open when ready to continue work. + +This is to make it clear to contributors that they are welcome to re-open +the expired MR when they are ready to return to working on it and moving +it forward. In the meantime, the MR will appear as ``Closed`` in GitLab, +but it can be differentiated from permanently closed MRs by the presence +of the ``workflow:expired`` label. + +**NOTE:** Please re-open *before* pushing an update to the MR topic branch +to ensure GitLab will still act on the association. If changes are pushed +before re-opening the MR, the reviewer should initiate a ``Do: check`` to +force GitLab to act on the updates. + +External Discussion +--- + +In some situations, a series of comments on a MR may develop into a more +involved discussion, or it may become
[Cmake-commits] CMake branch, master, updated. v3.14.4-1162-ga6a04cc
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, master has been updated
via a6a04cc446e67017e74e294a4aef84e9e8da4323 (commit)
via 6e8acc51a57e60aff307e4730c8a2314e5cf737a (commit)
via 9dad42d21a67592040d1100882147eed77753392 (commit)
via 4fe34b2d29ca67ea91b2545b223dad8abbcad282 (commit)
via 57cedb18c097a7231223b8a4279534216cad1b93 (commit)
via 6136ab5e179b33ddd659ad458ad8efd773ec8db8 (commit)
via 6a23fbce47294e746c15ee851dc3460a3a17da2b (commit)
from 05af1770a05e00d67f12f4e3ef294360d8d6480d (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a6a04cc446e67017e74e294a4aef84e9e8da4323
commit a6a04cc446e67017e74e294a4aef84e9e8da4323
Merge: 6e8acc5 4fe34b2
Author: Brad King
AuthorDate: Thu May 30 13:55:22 2019 +
Commit: Kitware Robot
CommitDate: Thu May 30 09:58:37 2019 -0400
Merge topic 'fix-clang-warnings'
4fe34b2d29 Fixing warnings generated by clang 8.0 on Windows
Acked-by: Kitware Robot
Merge-request: !3396
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e8acc51a57e60aff307e4730c8a2314e5cf737a
commit 6e8acc51a57e60aff307e4730c8a2314e5cf737a
Merge: 9dad42d 57cedb1
Author: Brad King
AuthorDate: Thu May 30 13:53:04 2019 +
Commit: Kitware Robot
CommitDate: Thu May 30 09:57:11 2019 -0400
Merge topic 'string-tar'
57cedb18c0 cmSystemTools: std::string parameters for tar functions
Acked-by: Kitware Robot
Merge-request: !3392
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9dad42d21a67592040d1100882147eed77753392
commit 9dad42d21a67592040d1100882147eed77753392
Merge: 05af177 6136ab5
Author: Brad King
AuthorDate: Thu May 30 13:52:50 2019 +
Commit: Kitware Robot
CommitDate: Thu May 30 09:53:09 2019 -0400
Merge topic 'ninja_rule_class'
6136ab5e17 Ninja: Use cmNinjaRule as sole parameter in the WriteRule and
AddRule methods
6a23fbce47 Ninja: Add cmNinjaRule class
Acked-by: Kitware Robot
Merge-request: !3393
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4fe34b2d29ca67ea91b2545b223dad8abbcad282
commit 4fe34b2d29ca67ea91b2545b223dad8abbcad282
Author: Zsolt Parragi
AuthorDate: Wed May 29 18:03:34 2019 +0200
Commit: Zsolt Parragi
CommitDate: Wed May 29 18:18:09 2019 +0200
Fixing warnings generated by clang 8.0 on Windows
* Deprecation removals previously specific to MSVC/Intel now also used
by clang
* String literals were assigned to non const pointers. These are stored
in mutable arrays now
* An implicit function pointer to pointer conversion is a Microsoft
extension warning is suppressed by an explicit reinterpret_cast
* The MSVC specific deprecation macro for jsoncpp was moved after the
clang macro to avoid redefinition warnings. This is consistent with
how jsoncpp fixed the issue in 36d8cfd7
diff --git a/CompileFlags.cmake b/CompileFlags.cmake
index c231ede..91f2adf 100644
--- a/CompileFlags.cmake
+++ b/CompileFlags.cmake
@@ -8,11 +8,16 @@ if(WIN32 AND CMAKE_C_COMPILER_ID STREQUAL "Intel")
set(_INTEL_WINDOWS 1)
endif()
+if(WIN32 AND CMAKE_C_COMPILER_ID STREQUAL "Clang"
+ AND "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
+ set(_CLANG_MSVC_WINDOWS 1)
+endif()
+
# Disable deprecation warnings for standard C functions.
# really only needed for newer versions of VS, but should
# not hurt other versions, and this will work into the
# future
-if(MSVC OR _INTEL_WINDOWS)
+if(MSVC OR _INTEL_WINDOWS OR _CLANG_MSVC_WINDOWS)
add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
else()
endif()
@@ -21,9 +26,7 @@ if(MSVC)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stack:1000")
endif()
-if(CMAKE_CXX_COMPILER_ID STREQUAL Clang
- AND "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC"
- AND "x${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "xGNU")
+if(_CLANG_MSVC_WINDOWS AND "x${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL
"xGNU")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Xlinker
-stack:2000")
endif()
diff --git a/Source/cmCallVisualStudioMacro.cxx
b/Source/cmCallVisualStudioMacro.cxx
index 2f6cf64..f7a2244 100644
--- a/Source/cmCallVisualStudioMacro.cxx
+++ b/Source/cmCallVisualStudioMacro.cxx
@@ -61,7 +61,8 @@ HRESULT InstanceCallMacro(IDispatch* vsIDE, const
std::string& macro,
if (0 != vsIDE) {
DISPID dispid = (DISPID)-1;
-OLECHAR* name = L"ExecuteCommand";
+wchar_t execute_command[] = L"ExecuteCommand";
+OLECHAR* name = execute_command;
hr =
vsIDE->GetIDsOfNames(IID_NULL, ,
[Cmake-commits] CMake branch, master, updated. v3.14.4-1155-g05af177
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, master has been updated
via 05af1770a05e00d67f12f4e3ef294360d8d6480d (commit)
via 53cb1f2d04bc9ca7bd50bd3b1a60dc933eab0777 (commit)
from c68efd196eace176bed5216573d99fabba66df84 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05af1770a05e00d67f12f4e3ef294360d8d6480d
commit 05af1770a05e00d67f12f4e3ef294360d8d6480d
Merge: c68efd1 53cb1f2
Author: Brad King
AuthorDate: Thu May 30 13:39:23 2019 +
Commit: Kitware Robot
CommitDate: Thu May 30 09:39:35 2019 -0400
Merge topic 'tar-zstd-compression'
53cb1f2d04 cmake: Teach cmake -E tar command, Zstandard compression
Acked-by: Kitware Robot
Merge-request: !3357
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53cb1f2d04bc9ca7bd50bd3b1a60dc933eab0777
commit 53cb1f2d04bc9ca7bd50bd3b1a60dc933eab0777
Author: Bartosz Kosiorek
AuthorDate: Mon Mar 11 23:26:04 2019 +0100
Commit: Bartosz Kosiorek
CommitDate: Wed May 22 03:46:55 2019 +0200
cmake: Teach cmake -E tar command, Zstandard compression
Fixes #18657
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index df0d4c5..eddc3cb 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -546,20 +546,23 @@ Available commands are:
Compress the resulting archive with bzip2.
``J``
Compress the resulting archive with XZ.
- ``--``
-Stop interpreting options and treat all remaining arguments
-as file names even if they start in ``-``.
+ ``--zstd``
+Compress the resulting archive with Zstandard.
``--files-from=``
Read file names from the given file, one per line.
Blank lines are ignored. Lines may not start in ``-``
except for ``--add-file=`` to add files whose
names start in ``-``.
- ``--mtime=``
-Specify modification time recorded in tarball entries.
``--format=``
Specify the format of the archive to be created.
Supported formats are: ``7zip``, ``gnutar``, ``pax``,
``paxr`` (restricted pax, default), and ``zip``.
+ ``--mtime=``
+Specify modification time recorded in tarball entries.
+ ``--``
+Stop interpreting options and treat all remaining arguments
+as file names, even if they start with ``-``.
+
``time [...]``
Run command and display elapsed time.
diff --git a/Help/release/dev/cmake-e-tar-zstd-support.rst
b/Help/release/dev/cmake-e-tar-zstd-support.rst
new file mode 100644
index 000..e3488b5
--- /dev/null
+++ b/Help/release/dev/cmake-e-tar-zstd-support.rst
@@ -0,0 +1,7 @@
+Help/release/dev/cmake-e-tar-zstd-support
+-
+
+* The :manual:`cmake(1)` ``-E tar`` tool now support Zstandard compression
+ algorithm with ``--zstd`` option. Zstandard was designed to give
+ a compression ratio comparable to that of the DEFLATE (zip) algorithm,
+ but faster, especially for decompression.
diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index 177ba02..359d57a 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -137,6 +137,13 @@ cmArchiveWrite::cmArchiveWrite(std::ostream& os, Compress
c,
return;
}
break;
+case CompressZstd:
+ if (archive_write_add_filter_zstd(this->Archive) != ARCHIVE_OK) {
+this->Error = "archive_write_add_filter_zstd: ";
+this->Error += cm_archive_error_string(this->Archive);
+return;
+ }
+ break;
}
#if !defined(_WIN32) || defined(__CYGWIN__)
if (archive_read_disk_set_standard_lookup(this->Disk) != ARCHIVE_OK) {
diff --git a/Source/cmArchiveWrite.h b/Source/cmArchiveWrite.h
index 1f23dae..9ea88d3 100644
--- a/Source/cmArchiveWrite.h
+++ b/Source/cmArchiveWrite.h
@@ -49,7 +49,8 @@ public:
CompressGZip,
CompressBZip2,
CompressLZMA,
-CompressXZ
+CompressXZ,
+CompressZstd
};
/** Construct with output stream to which to write archive. */
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 545e6c5..4ba04ed 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1614,6 +1614,9 @@ bool cmSystemTools::CreateTar(const char* outFileName,
case TarCompressXZ:
compress = cmArchiveWrite::CompressXZ;
break;
+case TarCompressZstd:
+ compress = cmArchiveWrite::CompressZstd;
+ break;
case TarCompressNone:
compress = cmArchiveWrite::CompressNone;
break;
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index d145d47..64d6d7a 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -451,6 +451,7 @@ public:
