[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-509-g94c1645
Brad King
brad.king at kitware.com
Thu Jun 23 08:56:03 EDT 2016
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, next has been updated
via 94c1645bd423442f23dd8a08858b3310ea34150d (commit)
via 49a07d7a142c6ad4558b1ddf0d5d0561f9be5fd6 (commit)
via 8b3ffbe4afd689488fe02eec6c3363761025c5fd (commit)
via 46f49c918af040b92a63171388206adbb9a8b8bc (commit)
via 460a589d209f44628894ba02d0ee6ca4f402ec2d (commit)
from 622d3b3f10d01ba1ee8dd221ef45675761b9f8da (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=94c1645bd423442f23dd8a08858b3310ea34150d
commit 94c1645bd423442f23dd8a08858b3310ea34150d
Merge: 622d3b3 49a07d7
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 23 08:56:02 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 23 08:56:02 2016 -0400
Merge topic 'GetPrerequisites-typo' into next
49a07d7a Merge branch 'backport-GetPrerequisites-typo' into GetPrerequisites-typo
8b3ffbe4 GetPrerequisites: fix typo in comment
46f49c91 CMake Nightly Date Stamp
460a589d GetPrerequisites: fix typo in comment
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49a07d7a142c6ad4558b1ddf0d5d0561f9be5fd6
commit 49a07d7a142c6ad4558b1ddf0d5d0561f9be5fd6
Merge: 8b3ffbe 460a589
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 23 08:55:38 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 23 08:55:38 2016 -0400
Merge branch 'backport-GetPrerequisites-typo' into GetPrerequisites-typo
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b3ffbe4afd689488fe02eec6c3363761025c5fd
commit 8b3ffbe4afd689488fe02eec6c3363761025c5fd
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jun 22 21:38:08 2016 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 23 08:55:07 2016 -0400
GetPrerequisites: fix typo in comment
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 1981040..631220b 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -746,7 +746,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
set(gp_regex_error "")
set(gp_regex_fallback "")
set(gp_regex_cmp_count 1)
- # objdump generaates copious output so we create a grep filter to pre-filter results
+ # objdump generates copious output so we create a grep filter to pre-filter results
if(WIN32)
find_program(gp_grep_cmd findstr)
else()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=460a589d209f44628894ba02d0ee6ca4f402ec2d
commit 460a589d209f44628894ba02d0ee6ca4f402ec2d
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jun 22 21:38:08 2016 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Jun 22 21:38:08 2016 +0200
GetPrerequisites: fix typo in comment
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 375349f..aa5bf28 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -746,7 +746,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
set(gp_regex_error "")
set(gp_regex_fallback "")
set(gp_regex_cmp_count 1)
- # objdump generaates copious output so we create a grep filter to pre-filter results
+ # objdump generates copious output so we create a grep filter to pre-filter results
find_program(gp_grep_cmd grep)
if(gp_grep_cmd)
set(gp_cmd_maybe_filter COMMAND ${gp_grep_cmd} "^[[:blank:]]*DLL Name: ")
-----------------------------------------------------------------------
Summary of changes:
Modules/GetPrerequisites.cmake | 2 +-
Source/CMakeVersion.cmake | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list