[Cmake-commits] CMake branch, next, updated. v3.2.1-1301-g1409adb

[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, next has been updated
       via  1409adbd6d548f7ef95d1abbc85c76f13f5c8e22 (commit)
       via  c46125dfac88d566f0bac380bbdee845e839082f (commit)
       via  d51c1f090a5df5a8cd8d58faeee3544b52463924 (commit)
      from  bc236b26c8444d855799e78fc6190273141c2792 (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=1409adbd6d548f7ef95d1abbc85c76f13f5c8e22
commit 1409adbd6d548f7ef95d1abbc85c76f13f5c8e22
Merge: bc236b2 c46125d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 31 08:59:36 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 31 08:59:36 2015 -0400

    Merge topic 'doc-COMPILE_OPTIONS-cleanup' into next
    
    c46125df Help: Refine COMPILE_OPTIONS property documentation
    d51c1f09 Help: Fix xref typos in target_compile_options docs


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c46125dfac88d566f0bac380bbdee845e839082f
commit c46125dfac88d566f0bac380bbdee845e839082f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 31 08:55:16 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 31 08:58:11 2015 -0400

    Help: Refine COMPILE_OPTIONS property documentation
    
    Make wording of the directory and target properties more consitent
    and complementary.  Specify that the value is a ";-list" with a link
    to the cmake-language(7) manual section on lists.

diff --git a/Help/prop_dir/COMPILE_OPTIONS.rst b/Help/prop_dir/COMPILE_OPTIONS.rst
index 5530860..877deb0 100644
--- a/Help/prop_dir/COMPILE_OPTIONS.rst
+++ b/Help/prop_dir/COMPILE_OPTIONS.rst
@@ -3,8 +3,8 @@ COMPILE_OPTIONS
 
 List of options to pass to the compiler.
 
-This property specifies the list of options given so far to the
-:command:`add_compile_options` command.
+This property holds a :ref:`;-list <CMake Language Lists>` of options
+given so far to the :command:`add_compile_options` command.
 
 This property is used to initialize the :prop_tgt:`COMPILE_OPTIONS` target
 property when a target is created, which is used by the generators to set
diff --git a/Help/prop_tgt/COMPILE_OPTIONS.rst b/Help/prop_tgt/COMPILE_OPTIONS.rst
index 27cbec1..36d786a 100644
--- a/Help/prop_tgt/COMPILE_OPTIONS.rst
+++ b/Help/prop_tgt/COMPILE_OPTIONS.rst
@@ -3,12 +3,13 @@ COMPILE_OPTIONS
 
 List of options to pass to the compiler.
 
-This property specifies the list of options specified so far for this
-property.
+This property holds a :ref:`;-list <CMake Language Lists>` of options
+specified so far for its target.  Use the :command:`target_compile_options`
+command to append more options.
 
 This property is intialized by the :prop_dir:`COMPILE_OPTIONS` directory
-property, which is used by the generators to set the options for the
-compiler.
+property when a target is created, and is used by the generators to set
+the options for the compiler.
 
 Contents of ``COMPILE_OPTIONS`` may use "generator expressions" with the
 syntax ``$<...>``.  See the :manual:`cmake-generator-expressions(7)` manual

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d51c1f090a5df5a8cd8d58faeee3544b52463924
commit d51c1f090a5df5a8cd8d58faeee3544b52463924
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 31 08:51:05 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 31 08:51:05 2015 -0400

    Help: Fix xref typos in target_compile_options docs
    
    Fix links to the COMPILE_OPTIONS directory and target properties.

diff --git a/Help/command/target_compile_options.rst b/Help/command/target_compile_options.rst
index 3362c5d..73e01e7 100644
--- a/Help/command/target_compile_options.rst
+++ b/Help/command/target_compile_options.rst
@@ -20,8 +20,8 @@ alternative commands exist to add preprocessor definitions
 (:command:`target_compile_definitions` and :command:`add_definitions`) or
 include directories (:command:`target_include_directories` and
 :command:`include_directories`).  See documentation of the
-:prop_tgt:`directory <COMPILE_OPTIONS>` and
-:prop_tgt:` target <COMPILE_OPTIONS>` ``COMPILE_OPTIONS`` properties.
+:prop_dir:`directory <COMPILE_OPTIONS>` and
+:prop_tgt:`target <COMPILE_OPTIONS>` ``COMPILE_OPTIONS`` properties.
 
 The ``INTERFACE``, ``PUBLIC`` and ``PRIVATE`` keywords are required to
 specify the scope of the following arguments.  ``PRIVATE`` and ``PUBLIC``

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

Summary of changes:
 Help/command/target_compile_options.rst |    4 ++--
 Help/prop_dir/COMPILE_OPTIONS.rst       |    4 ++--
 Help/prop_tgt/COMPILE_OPTIONS.rst       |    9 +++++----
 3 files changed, 9 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake