[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5692-gddd5df1

[Stephen Kelly]

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  ddd5df1687c02b46485b1ecabc9cb83d76956e4a (commit)
       via  abb17aaa93293f0f947b0a06125d9f4674908969 (commit)
       via  7df96ef417232a07c1ca13f4e29aada9d38f9cb2 (commit)
      from  f4ac72386558fb5693bfb8642a3959b0d6322c25 (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=ddd5df1687c02b46485b1ecabc9cb83d76956e4a
commit ddd5df1687c02b46485b1ecabc9cb83d76956e4a
Merge: f4ac723 abb17aa
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Nov 22 11:43:33 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 22 11:43:33 2013 -0500

    Merge topic 'INTERFACE_AUTOUIC_OPTIONS' into next
    
    abb17aa Clarify docs a bit.
    7df96ef Quote definition list items. Add UPPER_CASE doc.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=abb17aaa93293f0f947b0a06125d9f4674908969
commit abb17aaa93293f0f947b0a06125d9f4674908969
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Nov 22 17:42:55 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Nov 22 17:42:55 2013 +0100

    Clarify docs a bit.

diff --git a/Help/prop_tgt/INTERFACE_AUTOUIC_OPTIONS.rst b/Help/prop_tgt/INTERFACE_AUTOUIC_OPTIONS.rst
index 1f63f00..e97d293 100644
--- a/Help/prop_tgt/INTERFACE_AUTOUIC_OPTIONS.rst
+++ b/Help/prop_tgt/INTERFACE_AUTOUIC_OPTIONS.rst
@@ -4,9 +4,11 @@ INTERFACE_AUTOUIC_OPTIONS
 List of interface options to pass to uic.
 
 Targets may populate this property to publish the options
-required to use when invoking uic.  Consuming targets can add entries to their
-own :prop_tgt:`AUTOUIC_OPTIONS` property such as $<TARGET_PROPERTY:foo,INTERFACE_AUTOUIC_OPTIONS>
-to use the uic options specified in the interface of ``foo``.
+required to use when invoking ``uic``.  Consuming targets can add entries to their
+own :prop_tgt:`AUTOUIC_OPTIONS` property such as
+``$<TARGET_PROPERTY:foo,INTERFACE_AUTOUIC_OPTIONS>`` to use the uic options
+specified in the interface of ``foo``. This is done automatically by
+the :command:`target_link_libraries` command.
 
 This property supports generator expressions.  See the
 :manual:`cmake-generator-expressions(7)` manual for available expressions.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7df96ef417232a07c1ca13f4e29aada9d38f9cb2
commit 7df96ef417232a07c1ca13f4e29aada9d38f9cb2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Nov 22 17:39:31 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Nov 22 17:39:31 2013 +0100

    Quote definition list items. Add UPPER_CASE doc.

diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst
index c2501ab..06ed37f 100644
--- a/Help/manual/cmake-generator-expressions.7.rst
+++ b/Help/manual/cmake-generator-expressions.7.rst
@@ -178,7 +178,9 @@ property is non-empty::
   Content of ``...`` when the property is exported using :command:`export`, or
   when the target is used by another target in the same buildsystem. Expands to
   the empty string otherwise.
-$<LOWER_CASE:...>
+``$<LOWER_CASE:...>``
   Content of ``...`` converted to lower case.
-$<MAKE_C_IDENTIFIER:...>
+``$<UPPER_CASE:...>``
+  Content of ``...`` converted to upper case.
+``$<MAKE_C_IDENTIFIER:...>``
   Content of ``...`` converted to a C identifier.

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

Summary of changes:
 Help/manual/cmake-generator-expressions.7.rst |    6 ++++--
 Help/prop_tgt/INTERFACE_AUTOUIC_OPTIONS.rst   |    8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake