[Cmake-commits] CMake branch, next, updated. v2.8.12-4338-g6ea1c7d
Stephen Kelly
steveire at gmail.com
Wed Oct 23 09:10:24 EDT 2013
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 6ea1c7d3e94e14ea362d87add9b71f1a0099673b (commit)
via 6cce63c7dc572c1b8846d4350b66efff4a9022e6 (commit)
via dd6e36a0e2ef78e32f6e13dabf2d3d50c76c2aa2 (commit)
from 65109d61f0319907c0ca946e4a38d171d47e26fb (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=6ea1c7d3e94e14ea362d87add9b71f1a0099673b
commit 6ea1c7d3e94e14ea362d87add9b71f1a0099673b
Merge: 65109d6 6cce63c
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 23 09:10:21 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 23 09:10:21 2013 -0400
Merge topic 'compatible-interface-numbers' into next
6cce63c Use proper target property references in the documentation.
dd6e36a Remove unused variable.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6cce63c7dc572c1b8846d4350b66efff4a9022e6
commit 6cce63c7dc572c1b8846d4350b66efff4a9022e6
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 23 15:09:00 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 23 15:09:57 2013 +0200
Use proper target property references in the documentation.
diff --git a/Help/prop_tgt/COMPATIBLE_INTERFACE_BOOL.rst b/Help/prop_tgt/COMPATIBLE_INTERFACE_BOOL.rst
index 05e6137..83c18f1 100644
--- a/Help/prop_tgt/COMPATIBLE_INTERFACE_BOOL.rst
+++ b/Help/prop_tgt/COMPATIBLE_INTERFACE_BOOL.rst
@@ -14,5 +14,6 @@ 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
intersect with the set of properties from the
-COMPATIBLE_INTERFACE_STRING, COMPATIBLE_INTERFACE_NUMBER_MIN or
-COMPATIBLE_INTERFACE_NUMBER_MAX property.
+:prop_tgt:`COMPATIBLE_INTERFACE_STRING`,
+:prop_tgt:`COMPATIBLE_INTERFACE_NUMBER_MIN` or
+:prop_tgt:`COMPATIBLE_INTERFACE_NUMBER_MAX` property.
diff --git a/Help/prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MAX.rst b/Help/prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MAX.rst
index 19baf33..2fe748e 100644
--- a/Help/prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MAX.rst
+++ b/Help/prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MAX.rst
@@ -12,5 +12,6 @@ with each other and with the "FOO" property in the depender. When reading
the FOO property at generate time, the maximum value will be returned.
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,
-COMPATIBLE_INTERFACE_STRING or COMPATIBLE_INTERFACE_NUMBER_MIN property.
+with the set of properties from the :prop_tgt:`COMPATIBLE_INTERFACE_BOOL`,
+:prop_tgt:`COMPATIBLE_INTERFACE_STRING` or
+:prop_tgt:`COMPATIBLE_INTERFACE_NUMBER_MIN` property.
diff --git a/Help/prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MIN.rst b/Help/prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MIN.rst
index 70ece03..7fe384b 100644
--- a/Help/prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MIN.rst
+++ b/Help/prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MIN.rst
@@ -12,5 +12,6 @@ with each other and with the "FOO" property in the depender. When reading
the FOO property at generate time, the minimum value will be returned.
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,
-COMPATIBLE_INTERFACE_STRING or COMPATIBLE_INTERFACE_NUMBER_MAX property.
+with the set of properties from the :prop_tgt:`COMPATIBLE_INTERFACE_BOOL`,
+:prop_tgt:`COMPATIBLE_INTERFACE_STRING` or
+:prop_tgt:`COMPATIBLE_INTERFACE_NUMBER_MAX` property.
diff --git a/Help/prop_tgt/COMPATIBLE_INTERFACE_STRING.rst b/Help/prop_tgt/COMPATIBLE_INTERFACE_STRING.rst
index 5d10c1e..f3fb43d 100644
--- a/Help/prop_tgt/COMPATIBLE_INTERFACE_STRING.rst
+++ b/Help/prop_tgt/COMPATIBLE_INTERFACE_STRING.rst
@@ -11,6 +11,6 @@ property "FOO" appears in the list, then for each dependee, the
equal with each other, and with the "FOO" property in the dependee.
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,
-COMPATIBLE_INTERFACE_NUMBER_MIN or COMPATIBLE_INTERFACE_NUMBER_MAX
-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=dd6e36a0e2ef78e32f6e13dabf2d3d50c76c2aa2
commit dd6e36a0e2ef78e32f6e13dabf2d3d50c76c2aa2
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 23 15:03:01 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 23 15:03:01 2013 +0200
Remove unused variable.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ed36733..179a15f 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -4482,7 +4482,6 @@ const char * consistentNumberProperty(const char *lhs, const char *rhs,
{
double lnum;
double rnum;
- bool result;
if(sscanf(lhs, "%lg", &lnum) != 1 ||
sscanf(rhs, "%lg", &rnum) != 1)
{
-----------------------------------------------------------------------
Summary of changes:
Help/prop_tgt/COMPATIBLE_INTERFACE_BOOL.rst | 5 +++--
Help/prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MAX.rst | 5 +++--
Help/prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MIN.rst | 5 +++--
Help/prop_tgt/COMPATIBLE_INTERFACE_STRING.rst | 6 +++---
Source/cmTarget.cxx | 1 -
5 files changed, 12 insertions(+), 10 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list