diff options
| author | Brad King <brad.king@kitware.com> | 2015-03-31 13:17:51 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-03-31 13:17:51 (GMT) |
| commit | d66f052e9401ea3ae8194bace96d2596d8f9b4ae (patch) | |
| tree | b3c5ea8163dcc2ddee4baca035f7adc239ff4d14 | |
| parent | e6fe5b46d5b0adff67fd5af0d014a1735b66fcc2 (diff) | |
| parent | c46125dfac88d566f0bac380bbdee845e839082f (diff) | |
| download | CMake-d66f052e9401ea3ae8194bace96d2596d8f9b4ae.zip CMake-d66f052e9401ea3ae8194bace96d2596d8f9b4ae.tar.gz CMake-d66f052e9401ea3ae8194bace96d2596d8f9b4ae.tar.bz2 | |
Merge topic 'doc-COMPILE_OPTIONS-cleanup'
c46125df Help: Refine COMPILE_OPTIONS property documentation
d51c1f09 Help: Fix xref typos in target_compile_options docs
| -rw-r--r-- | Help/command/target_compile_options.rst | 4 | ||||
| -rw-r--r-- | Help/prop_dir/COMPILE_OPTIONS.rst | 4 | ||||
| -rw-r--r-- | Help/prop_tgt/COMPILE_OPTIONS.rst | 9 |
3 files changed, 9 insertions, 8 deletions
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`` 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 |