[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-183-g985b15a

[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  985b15af7291ed2d24d73d204d5a16c8a00bc52c (commit)
       via  a9f8c50aa208c4bd4ed4586f8d27cf423bb81c47 (commit)
      from  dba26980d614a72c9bb66a3cacc5a1ab4aceaf0d (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=985b15af7291ed2d24d73d204d5a16c8a00bc52c
commit 985b15af7291ed2d24d73d204d5a16c8a00bc52c
Merge: dba2698 a9f8c50
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 29 09:21:47 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 29 09:21:47 2014 -0400

    Merge topic 'doc-add_compile_options' into next
    
    a9f8c50a Help: Clarify add_compile_options documentation (#15225)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9f8c50aa208c4bd4ed4586f8d27cf423bb81c47
commit a9f8c50aa208c4bd4ed4586f8d27cf423bb81c47
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 29 09:18:56 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 29 09:18:56 2014 -0400

    Help: Clarify add_compile_options documentation (#15225)
    
    Explain that it affects only targets added after the call.  Fix the link
    to the COMPILE_OPTIONS directory propert documentation.  Update the
    latter to explain that it is used to initialize the corresponding target
    property when a target is created.

diff --git a/Help/command/add_compile_options.rst b/Help/command/add_compile_options.rst
index 214f4be..3fe2a33 100644
--- a/Help/command/add_compile_options.rst
+++ b/Help/command/add_compile_options.rst
@@ -7,15 +7,16 @@ Adds options to the compilation of source files.
 
   add_compile_options(<option> ...)
 
-Adds options to the compiler command line for sources in the current
-directory and below.  This command can be used to add any options, but
-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
+Adds options to the compiler command line for targets in the current
+directory and below that are added after this command is invoked.
+See documentation of the :prop_dir:`directory <COMPILE_OPTIONS>` and
 :prop_tgt:`target <COMPILE_OPTIONS>` ``COMPILE_OPTIONS`` properties.
 
+This command can be used to add any options, but 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`).
+
 Arguments to ``add_compile_options`` may use "generator expressions" with
 the syntax ``$<...>``.  See the :manual:`cmake-generator-expressions(7)`
 manual for available expressions.  See the :manual:`cmake-buildsystem(7)`
diff --git a/Help/prop_dir/COMPILE_OPTIONS.rst b/Help/prop_dir/COMPILE_OPTIONS.rst
index 5953059..5530860 100644
--- a/Help/prop_dir/COMPILE_OPTIONS.rst
+++ b/Help/prop_dir/COMPILE_OPTIONS.rst
@@ -6,9 +6,9 @@ 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 is used to populate the :prop_tgt:`COMPILE_OPTIONS` target
-property, which is used by the generators to set the options for the
-compiler.
+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
+the options for the compiler.
 
 Contents of ``COMPILE_OPTIONS`` may use "generator expressions" with the
 syntax ``$<...>``.  See the :manual:`cmake-generator-expressions(7)` manual

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

Summary of changes:
 Help/command/add_compile_options.rst |   15 ++++++++-------
 Help/prop_dir/COMPILE_OPTIONS.rst    |    6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake