[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-205-g3e00a76

[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  3e00a76c4ee11f3721d602e1bbcd2d4363c03cf6 (commit)
       via  352cbb6e360eccca050aebdc77868558821564af (commit)
      from  10387bf9de790b468b93c822d0b6c24a53ac892d (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=3e00a76c4ee11f3721d602e1bbcd2d4363c03cf6
commit 3e00a76c4ee11f3721d602e1bbcd2d4363c03cf6
Merge: 10387bf 352cbb6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 29 15:24:44 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 29 15:24:44 2014 -0400

    Merge topic 'doc-add_compile_options' into next
    
    352cbb6e Help: Reference add_compile_options from add_definitions (#15225)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=352cbb6e360eccca050aebdc77868558821564af
commit 352cbb6e360eccca050aebdc77868558821564af
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 29 15:21:16 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 29 15:23:31 2014 -0400

    Help: Reference add_compile_options from add_definitions (#15225)
    
    When we explain in add_definitions documentation that it is intended
    only for preprocessor definitions, link to add_compile_options for
    adding other flags.  Also explicitly mention that the order of
    add_definitions calls with respect to target creation does not matter.
    This differs from the behavior now explicitly stated in the
    documentation of add_compile_options.

diff --git a/Help/command/add_definitions.rst b/Help/command/add_definitions.rst
index 2965c37..a04faf5 100644
--- a/Help/command/add_definitions.rst
+++ b/Help/command/add_definitions.rst
@@ -7,10 +7,12 @@ Adds -D define flags to the compilation of source files.
 
   add_definitions(-DFOO -DBAR ...)
 
-Adds definitions to the compiler command line for sources in the current
-directory and below.  This command can be used to add any flags, but
-it is intended to add preprocessor definitions.  Flags
-beginning in -D or /D that look like preprocessor definitions are
+Adds definitions to the compiler command line for targets in the current
+directory and below (whether added before or after this command is invoked).
+This command can be used to add any flags, but it is intended to add
+preprocessor definitions (see the :command:`add_compile_options` command
+to add other flags).
+Flags beginning in -D or /D that look like preprocessor definitions are
 automatically added to the :prop_dir:`COMPILE_DEFINITIONS` directory
 property for the current directory.  Definitions with non-trivial values
 may be left in the set of flags instead of being converted for reasons of

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

Summary of changes:
 Help/command/add_definitions.rst |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake