From d51c1f090a5df5a8cd8d58faeee3544b52463924 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 31 Mar 2015 08:51:05 -0400 Subject: [PATCH 1/2] Help: Fix xref typos in target_compile_options docs Fix links to the COMPILE_OPTIONS directory and target properties. --- Help/command/target_compile_options.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Help/command/target_compile_options.rst b/Help/command/target_compile_options.rst index 3362c5d88..73e01e7f8 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 ` and -:prop_tgt:` target ` ``COMPILE_OPTIONS`` properties. +:prop_dir:`directory ` and +:prop_tgt:`target ` ``COMPILE_OPTIONS`` properties. The ``INTERFACE``, ``PUBLIC`` and ``PRIVATE`` keywords are required to specify the scope of the following arguments. ``PRIVATE`` and ``PUBLIC`` From c46125dfac88d566f0bac380bbdee845e839082f Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 31 Mar 2015 08:55:16 -0400 Subject: [PATCH 2/2] 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. --- Help/prop_dir/COMPILE_OPTIONS.rst | 4 ++-- Help/prop_tgt/COMPILE_OPTIONS.rst | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Help/prop_dir/COMPILE_OPTIONS.rst b/Help/prop_dir/COMPILE_OPTIONS.rst index 55308608e..877deb000 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 ` 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 27cbec15f..36d786a7f 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 ` 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