summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-10-29 13:18:56 (GMT)
committerBrad King <brad.king@kitware.com>2014-10-29 13:18:56 (GMT)
commita9f8c50aa208c4bd4ed4586f8d27cf423bb81c47 (patch)
tree424dcfc85462ff08c25ddb6237667f8962e66532
parent54ff77dc621a91302abad0ab38d9bd26de8914b9 (diff)
downloadCMake-a9f8c50aa208c4bd4ed4586f8d27cf423bb81c47.zip
CMake-a9f8c50aa208c4bd4ed4586f8d27cf423bb81c47.tar.gz
CMake-a9f8c50aa208c4bd4ed4586f8d27cf423bb81c47.tar.bz2
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.
-rw-r--r--Help/command/add_compile_options.rst15
-rw-r--r--Help/prop_dir/COMPILE_OPTIONS.rst6
2 files changed, 11 insertions, 10 deletions
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