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 c126e80b5a7a9cf98ebea7c34a2b5b5f848dfab1 (commit)
via 3843d0550bf0657b5626d02c4184350c8f26aff5 (commit)
via 82dec5191ccfd1308c157075acc53f677a8895de (commit)
via b127e0c5610221d10c1d6658db96741ab85a083c (commit)
from fcfbc01d68aac2eca7435bfa0f01e5d1b3524303 (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=c126e80b5a7a9cf98ebea7c34a2b5b5f848dfab1
commit c126e80b5a7a9cf98ebea7c34a2b5b5f848dfab1
Merge: 3843d05 b127e0c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Mar 27 17:58:49 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Mar 27 13:59:26 2019 -0400
Merge topic 'cuda-bracket-output'
b127e0c561 CUDA: Tolerate square brackets in PROMPT environment variable
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3151
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3843d0550bf0657b5626d02c4184350c8f26aff5
commit 3843d0550bf0657b5626d02c4184350c8f26aff5
Merge: fcfbc01 82dec51
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Mar 27 17:58:30 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Mar 27 13:58:38 2019 -0400
Merge topic 'find_dependency-cleanup'
82dec5191c find_dependency: Remove clearing of unused cmake_fd_exact_arg
variable
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3149
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82dec5191ccfd1308c157075acc53f677a8895de
commit 82dec5191ccfd1308c157075acc53f677a8895de
Author: Damien R <9464-damie...@users.noreply.gitlab.kitware.com>
AuthorDate: Tue Mar 26 14:17:19 2019 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Mar 26 11:56:02 2019 -0400
find_dependency: Remove clearing of unused cmake_fd_exact_arg variable
The variable is unused since commit ab358d6a85 (Improve find_dependency
argument handling, 2017-05-22, v3.9.0-rc1~57^2) where handling of EXACT
keyword in find_dependency was reworked.
diff --git a/Modules/CMakeFindDependencyMacro.cmake
b/Modules/CMakeFindDependencyMacro.cmake
index de1a332..ab22701 100644
--- a/Modules/CMakeFindDependencyMacro.cmake
+++ b/Modules/CMakeFindDependencyMacro.cmake
@@ -61,6 +61,5 @@ macro(find_dependency dep)
endif()
set(cmake_fd_required_arg)
set(cmake_fd_quiet_arg)
- set(cmake_fd_exact_arg)
endif()
endmacro()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b127e0c5610221d10c1d6658db96741ab85a083c
commit b127e0c5610221d10c1d6658db96741ab85a083c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Mar 26 10:40:11 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Mar 26 10:43:51 2019 -0400
CUDA: Tolerate square brackets in PROMPT environment variable
The `PROMPT` environment variable affects nvcc's output. Fix
our parsing of that output to tolerate square brackets.
Fixes: #19089
diff --git a/Modules/CMakeDetermineCUDACompiler.cmake
b/Modules/CMakeDetermineCUDACompiler.cmake
index 113b520..490d659 100644
--- a/Modules/CMakeDetermineCUDACompiler.cmake
+++ b/Modules/CMakeDetermineCUDACompiler.cmake
@@ -111,10 +111,15 @@ elseif(CMAKE_CUDA_COMPILER_ID STREQUAL NVIDIA)
if(_nvcc_libraries)
# Remove variable assignments.
string(REGEX REPLACE "#\\\$ *[^= ]+=[^\n]*\n" "" _nvcc_output
"${_nvcc_output_orig}")
+ # Encode [] characters that break list expansion.
+ string(REPLACE "[" "{==={" _nvcc_output "${_nvcc_output}")
+ string(REPLACE "]" "}===}" _nvcc_output "${_nvcc_output}")
# Split lines.
string(REGEX REPLACE "\n+(#\\\$ )?" ";" _nvcc_output "${_nvcc_output}")
foreach(line IN LISTS _nvcc_output)
set(_nvcc_output_line "${line}")
+ string(REPLACE "{==={" "[" _nvcc_output_line "${_nvcc_output_line}")
+ string(REPLACE "}===}" "]" _nvcc_output_line "${_nvcc_output_line}")
string(APPEND _nvcc_log " considering line: [${_nvcc_output_line}]\n")
if("${_nvcc_output_line}" MATCHES "^ *nvlink")
string(APPEND _nvcc_log " ignoring nvlink line\n")
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeDetermineCUDACompiler.cmake | 5 +++++
Modules/CMakeFindDependencyMacro.cmake | 1 -
2 files changed, 5 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
