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 dd87ef3f66520d6704f99c0bd145d55811603fb5 (commit)
via 566086187f21aef0686f0f21e97d06e93a205db8 (commit)
from 303a047030056ecbc5981bcc3c749968085e828d (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=dd87ef3f66520d6704f99c0bd145d55811603fb5
commit dd87ef3f66520d6704f99c0bd145d55811603fb5
Merge: 303a047 5660861
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jul 11 10:03:42 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jul 11 10:03:42 2016 -0400
Merge topic 'cmake-spelling' into next
56608618 Fix typos.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=566086187f21aef0686f0f21e97d06e93a205db8
commit 566086187f21aef0686f0f21e97d06e93a205db8
Author: Felix Geyer <de...@fobos.de>
AuthorDate: Sun Jul 10 11:05:56 2016 +0200
Commit: Felix Geyer <de...@fobos.de>
CommitDate: Sun Jul 10 11:05:56 2016 +0200
Fix typos.
diff --git a/Help/manual/cmake-buildsystem.7.rst
b/Help/manual/cmake-buildsystem.7.rst
index 07bf33f..4950fee 100644
--- a/Help/manual/cmake-buildsystem.7.rst
+++ b/Help/manual/cmake-buildsystem.7.rst
@@ -860,7 +860,7 @@ with :prop_tgt:`IMPORTED` targets.
Alias Targets
-------------
-An ``ALIAS`` target is a name which may be used interchangably with
+An ``ALIAS`` target is a name which may be used interchangeably with
a binary target name in read-only contexts. A primary use-case for ``ALIAS``
targets is for example or unit test executables accompanying a library, which
may be part of the same buildsystem or built separately based on user
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 81fc7a8..8c000a0 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -299,7 +299,7 @@
# implementation (alternative to:
# CUDA_ADD_CUFFT_TO_TARGET macro)
# CUDA_CUBLAS_LIBRARIES -- Device or emulation library for the Cuda BLAS
-# implementation (alterative to:
+# implementation (alternative to:
# CUDA_ADD_CUBLAS_TO_TARGET macro).
# CUDA_cudart_static_LIBRARY -- Statically linkable cuda runtime library.
# Only available for CUDA version 5.5+
diff --git a/Modules/GenerateExportHeader.cmake
b/Modules/GenerateExportHeader.cmake
index 6205b8c..5540236 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -81,7 +81,7 @@
# ``OTHER_NAME_EXPORT``, ``OTHER_NAME_NO_EXPORT`` and ``OTHER_NAME_DEPRECATED``
# etc.
#
-# The ``BASE_NAME`` may be overridden by specifiying other options in the
+# The ``BASE_NAME`` may be overridden by specifying other options in the
# function. For example:
#
# .. code-block:: cmake
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index ff767e6..2f29791 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1455,7 +1455,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::string&
linkLibraries,
w << cmPolicies::GetPolicyWarning(cmPolicies::CMP0065) << "\n"
"For compatibility with older versions of CMake, "
"additional flags may be added to export symbols on all "
- "executables regardless of thier ENABLE_EXPORTS property.";
+ "executables regardless of their ENABLE_EXPORTS property.";
/* clang-format on */
this->IssueMessage(cmake::AUTHOR_WARNING, w.str());
}
diff --git a/Tests/RunCMake/CMP0065/WARN-ON-stderr.txt
b/Tests/RunCMake/CMP0065/WARN-ON-stderr.txt
index dda4fe5..c31ec38 100644
--- a/Tests/RunCMake/CMP0065/WARN-ON-stderr.txt
+++ b/Tests/RunCMake/CMP0065/WARN-ON-stderr.txt
@@ -5,6 +5,6 @@ CMake Warning \(dev\) in CMakeLists.txt:
set the policy and suppress this warning.
For compatibility with older versions of CMake, additional flags may be
- added to export symbols on all executables regardless of thier
+ added to export symbols on all executables regardless of their
ENABLE_EXPORTS property.
This warning is for project developers. Use -Wno-dev to suppress it.
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-buildsystem.7.rst | 2 +-
Modules/FindCUDA.cmake | 2 +-
Modules/GenerateExportHeader.cmake | 2 +-
Source/cmLocalGenerator.cxx | 2 +-
Tests/RunCMake/CMP0065/WARN-ON-stderr.txt | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
