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 eb685cc5086741fd91d9d8aa56a8893760ec3f0b (commit)
via f3f49ff7a915daebdbc114599e862627e3731979 (commit)
via b0686fdedaea5d27292e52f753806aebb3401b47 (commit)
from ece1d4bb6311da96abbdae49236c006152ffd2ea (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb685cc5086741fd91d9d8aa56a8893760ec3f0b
commit eb685cc5086741fd91d9d8aa56a8893760ec3f0b
Merge: ece1d4b f3f49ff
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Oct 23 18:02:33 2013 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Oct 23 18:02:33 2013 -0400
Merge topic 'minor-cleanups' into next
f3f49ff Docs: Fix typo
b0686fd Docs: Fix typo.
diff --cc Help/prop_tgt/COMPATIBLE_INTERFACE_STRING.rst
index f3fb43d,68de2e2..1794d87
--- a/Help/prop_tgt/COMPATIBLE_INTERFACE_STRING.rst
+++ b/Help/prop_tgt/COMPATIBLE_INTERFACE_STRING.rst
@@@ -8,9 -8,8 +8,9 @@@ properties for this target which must b
string in the INTERFACE of all linked dependees. For example, if a
property "FOO" appears in the list, then for each dependee, the
"INTERFACE_FOO" property content in all of its dependencies must be
- equal with each other, and with the "FOO" property in the dependee.
+ equal with each other, and with the "FOO" property in the depender.
If the property is not set, then it is ignored. Note that for each
dependee, the set of properties from this property must not intersect
-with the set of properties from the COMPATIBLE_INTERFACE_BOOL
-property.
+with the set of properties from the :prop_tgt:`COMPATIBLE_INTERFACE_BOOL`,
+:prop_tgt:`COMPATIBLE_INTERFACE_NUMBER_MIN` or
+:prop_tgt:`COMPATIBLE_INTERFACE_NUMBER_MAX` property.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3f49ff7a915daebdbc114599e862627e3731979
commit f3f49ff7a915daebdbc114599e862627e3731979
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Oct 23 23:41:00 2013 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Wed Oct 23 23:41:00 2013 +0200
Docs: Fix typo
opitions -> options.
diff --git a/Help/command/target_compile_options.rst
b/Help/command/target_compile_options.rst
index 88a4ea3..71d57f9 100644
--- a/Help/command/target_compile_options.rst
+++ b/Help/command/target_compile_options.rst
@@ -18,7 +18,7 @@ The INTERFACE, PUBLIC and PRIVATE keywords are required to
specify the
scope of the following arguments. PRIVATE and PUBLIC items will
populate the COMPILE_OPTIONS property of <target>. PUBLIC and
INTERFACE items will populate the INTERFACE_COMPILE_OPTIONS property
-of <target>. The following arguments specify compile opitions.
+of <target>. The following arguments specify compile options.
Repeated calls for the same <target> append items in the order called.
Arguments to target_compile_options may use "generator expressions"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0686fdedaea5d27292e52f753806aebb3401b47
commit b0686fdedaea5d27292e52f753806aebb3401b47
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue Oct 22 21:05:11 2013 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Wed Oct 23 13:33:26 2013 +0200
Docs: Fix typo.
dependee -> depender.
diff --git a/Help/prop_tgt/COMPATIBLE_INTERFACE_BOOL.rst
b/Help/prop_tgt/COMPATIBLE_INTERFACE_BOOL.rst
index 7f95ef0..f259940 100644
--- a/Help/prop_tgt/COMPATIBLE_INTERFACE_BOOL.rst
+++ b/Help/prop_tgt/COMPATIBLE_INTERFACE_BOOL.rst
@@ -9,7 +9,7 @@ boolean in the INTERFACE of all linked dependees. For example,
if a
property "FOO" appears in the list, then for each dependee, the
"INTERFACE_FOO" property content in all of its dependencies must be
consistent with each other, and with the "FOO" property in the
-dependee. Consistency in this sense has the meaning that if the
+depender. Consistency in this sense has the meaning that if the
property is set, then it must have the same boolean value as all
others, and if the property is not set, then it is ignored. Note that
for each dependee, the set of properties from this property must not
diff --git a/Help/prop_tgt/COMPATIBLE_INTERFACE_STRING.rst
b/Help/prop_tgt/COMPATIBLE_INTERFACE_STRING.rst
index a461f76..68de2e2 100644
--- a/Help/prop_tgt/COMPATIBLE_INTERFACE_STRING.rst
+++ b/Help/prop_tgt/COMPATIBLE_INTERFACE_STRING.rst
@@ -8,7 +8,7 @@ properties for this target which must be the same when
evaluated as a
string in the INTERFACE of all linked dependees. For example, if a
property "FOO" appears in the list, then for each dependee, the
"INTERFACE_FOO" property content in all of its dependencies must be
-equal with each other, and with the "FOO" property in the dependee.
+equal with each other, and with the "FOO" property in the depender.
If the property is not set, then it is ignored. Note that for each
dependee, the set of properties from this property must not intersect
with the set of properties from the COMPATIBLE_INTERFACE_BOOL
-----------------------------------------------------------------------
Summary of changes:
Help/command/target_compile_options.rst | 2 +-
Help/prop_tgt/COMPATIBLE_INTERFACE_BOOL.rst | 2 +-
Help/prop_tgt/COMPATIBLE_INTERFACE_STRING.rst | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
