[Cmake-commits] CMake branch, master, updated. v2.8.12-464-g4025013

[Brad King]

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  4025013dd78abeaef772eee1fc532ce275ae4216 (commit)
       via  ff6c401309761f0c0061f1084f2e3150038962a5 (commit)
       via  e4e20c1d194152a97043e94f1bd5ef9476812682 (commit)
       via  98777694b99868bdad2ab6eb7e3d6b5113bfa204 (commit)
       via  816b4a8a18b85c52529fc9cef4b20ad6af654734 (commit)
       via  030800a78a98035a1cfd95a148395bb2c442d650 (commit)
      from  5f789db847a86cbdfb94fcf1abd4d561a6942d65 (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=4025013dd78abeaef772eee1fc532ce275ae4216
commit 4025013dd78abeaef772eee1fc532ce275ae4216
Merge: 5f789db ff6c401
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Oct 26 10:28:30 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 26 10:28:30 2013 -0400

    Merge topic 'compatible-interface-numbers'
    
    ff6c401 cmTarget: Add interface for compatible numeric properties
    e4e20c1 cmTarget: Add enumeration for consistency to expect from properties.
    9877769 cmTarget: Assign consistent content back to the property being evaluated.
    816b4a8 cmTarget: Make consistentProperty return consistent content.
    030800a cmTarget: Add a template to create correct implied content.

diff --cc Help/prop_tgt/COMPATIBLE_INTERFACE_STRING.rst
index 68de2e2,f3fb43d..1794d87
--- a/Help/prop_tgt/COMPATIBLE_INTERFACE_STRING.rst
+++ b/Help/prop_tgt/COMPATIBLE_INTERFACE_STRING.rst
@@@ -8,8 -8,9 +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.

-----------------------------------------------------------------------

Summary of changes:
 Help/manual/cmake-properties.7.rst                |    2 +
 Help/prop_tgt/COMPATIBLE_INTERFACE_BOOL.rst       |    4 +-
 Help/prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MAX.rst |   17 ++
 Help/prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MIN.rst |   17 ++
 Help/prop_tgt/COMPATIBLE_INTERFACE_STRING.rst     |    5 +-
 Source/cmExportFileGenerator.cxx                  |   14 +
 Source/cmGeneratorExpressionEvaluator.cxx         |   44 +++
 Source/cmTarget.cxx                               |  319 ++++++++++++++++++---
 Source/cmTarget.h                                 |    8 +
 Tests/CompatibleInterface/CMakeLists.txt          |   22 ++
 Tests/CompatibleInterface/main.cpp                |   13 +
 11 files changed, 429 insertions(+), 36 deletions(-)
 create mode 100644 Help/prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MAX.rst
 create mode 100644 Help/prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MIN.rst


hooks/post-receive
-- 
CMake