[Cmake-commits] CMake branch, master, updated. v3.12.2-641-ga6ae99e
Kitware Robot
kwrobot at kitware.com
Mon Sep 17 09:25:04 EDT 2018
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 a6ae99ebbe01350f46d8540cc8b792bc6c1cc3d6 (commit)
via b3f1e654860f6e1481fc0e07f6fb7dfab585472f (commit)
via 6209434b441b0857b8601dd39498c3796d338c5a (commit)
via 49e7a82c90bd1ccd59089b6c0b1687c341e51d5e (commit)
via b13c8526b1f617f5dd146f42c6e1d48040cb527d (commit)
from 19daeda516f6c9008475511a578909ae578a8b41 (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=a6ae99ebbe01350f46d8540cc8b792bc6c1cc3d6
commit a6ae99ebbe01350f46d8540cc8b792bc6c1cc3d6
Merge: b3f1e65 6209434
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 17 13:23:23 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Sep 17 09:24:10 2018 -0400
Merge topic 'FindCUDA-doc-typo'
6209434b44 FindCUDA: Fix "alphabetical" typo
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2387
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3f1e654860f6e1481fc0e07f6fb7dfab585472f
commit b3f1e654860f6e1481fc0e07f6fb7dfab585472f
Merge: 19daeda 49e7a82
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 17 13:22:22 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Sep 17 09:22:38 2018 -0400
Merge topic 'update-kwsys'
49e7a82c90 Merge branch 'upstream-KWSys' into update-kwsys
b13c8526b1 KWSys 2018-09-14 (1809bedd)
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2385
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6209434b441b0857b8601dd39498c3796d338c5a
commit 6209434b441b0857b8601dd39498c3796d338c5a
Author: Nikolaus Wittenstein <nikolaus.wittenstein at gmail.com>
AuthorDate: Fri Sep 14 14:34:35 2018 -0400
Commit: Nikolaus Wittenstein <nwittenstein at argo.ai>
CommitDate: Fri Sep 14 14:53:03 2018 -0400
FindCUDA: Fix "alphabetical" typo
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 1650e55..5547dee 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -43,7 +43,7 @@
# matches what is needed by the CUDA runtime version.
#
# The following variables affect the behavior of the macros in the
-# script (in alphebetical order). Note that any of these flags can be
+# script (in alphabetical order). Note that any of these flags can be
# changed multiple times in the same directory before calling
# ``CUDA_ADD_EXECUTABLE``, ``CUDA_ADD_LIBRARY``, ``CUDA_COMPILE``,
# ``CUDA_COMPILE_PTX``, ``CUDA_COMPILE_FATBIN``, ``CUDA_COMPILE_CUBIN``
@@ -147,7 +147,7 @@
# VERBOSE=1 to see output), although setting CUDA_VERBOSE_BUILD to ON will
# always print the output.
#
-# The script creates the following macros (in alphebetical order)::
+# The script creates the following macros (in alphabetical order)::
#
# CUDA_ADD_CUFFT_TO_TARGET( cuda_target )
# -- Adds the cufft library to the target (can be any target). Handles whether
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49e7a82c90bd1ccd59089b6c0b1687c341e51d5e
commit 49e7a82c90bd1ccd59089b6c0b1687c341e51d5e
Merge: 333804f b13c852
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 14 13:25:53 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 14 13:25:53 2018 -0400
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2018-09-14 (1809bedd)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b13c8526b1f617f5dd146f42c6e1d48040cb527d
commit b13c8526b1f617f5dd146f42c6e1d48040cb527d
Author: KWSys Upstream <kwrobot at kitware.com>
AuthorDate: Fri Sep 14 13:13:00 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 14 13:25:53 2018 -0400
KWSys 2018-09-14 (1809bedd)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit 1809bedde0491d078ad42200bf2834c345e65398 (master).
Upstream Shortlog
-----------------
Ben Boeckel (2):
b5b294c1 SystemTools::Split: fix copy-pasta comments
ab0d44c9 SystemTools::Split: use str.find_first_of(char)
Roger Leigh (1):
bdd39241 Process: On Windows do not open stdin file with write permission
diff --git a/ProcessWin32.c b/ProcessWin32.c
index 9fa0cb1..2a2e737 100644
--- a/ProcessWin32.c
+++ b/ProcessWin32.c
@@ -973,8 +973,8 @@ void kwsysProcess_Execute(kwsysProcess* cp)
wchar_t* wstdin = kwsysEncoding_DupToWide(cp->PipeFileSTDIN);
DWORD error;
cp->PipeChildStd[0] =
- CreateFileW(wstdin, GENERIC_READ | GENERIC_WRITE,
- FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, 0, 0);
+ CreateFileW(wstdin, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, 0,
+ OPEN_EXISTING, 0, 0);
error = GetLastError(); /* Check now in case free changes this. */
free(wstdin);
if (cp->PipeChildStd[0] == INVALID_HANDLE_VALUE) {
diff --git a/SystemTools.cxx b/SystemTools.cxx
index 476fe08..0a4ad7a 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -3640,11 +3640,11 @@ bool SystemTools::Split(const std::string& str,
while (lpos < data.length()) {
std::string::size_type rpos = data.find_first_of(separator, lpos);
if (rpos == std::string::npos) {
- // Line ends at end of string without a newline.
+ // String ends at end of string without a separator.
lines.push_back(data.substr(lpos));
return false;
} else {
- // Line ends in a "\n", remove the character.
+ // String ends in a separator, remove the character.
lines.push_back(data.substr(lpos, rpos - lpos));
}
lpos = rpos + 1;
@@ -3658,7 +3658,7 @@ bool SystemTools::Split(const std::string& str,
std::string data(str);
std::string::size_type lpos = 0;
while (lpos < data.length()) {
- std::string::size_type rpos = data.find_first_of("\n", lpos);
+ std::string::size_type rpos = data.find_first_of('\n', lpos);
if (rpos == std::string::npos) {
// Line ends at end of string without a newline.
lines.push_back(data.substr(lpos));
-----------------------------------------------------------------------
Summary of changes:
Modules/FindCUDA.cmake | 4 ++--
Source/kwsys/ProcessWin32.c | 4 ++--
Source/kwsys/SystemTools.cxx | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list