Merge topic 'source_file_both_props'

961ee62faa Help: Update get_property and get_source_file_property docs
1235f2d747 set_property: Allow both DIRECTORY and TARGET_DIRECTORY together
177052d6b8 set_property: Fix name of TARGET_DIRECTORY option in error messages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4994

Help/command/get_property.rst

@@ -10,7 +10,7 @@ Get a property.
                 DIRECTORY [<dir>]  |
                 TARGET    <target> |
                 SOURCE    <source> |
-                          [<TARGET_DIRECTORY ... | DIRECTORY ...>]   |
+                          [TARGET_DIRECTORY <target> | DIRECTORY <dir>] |
                 INSTALL   <file>   |
                 TEST      <test>   |
                 CACHE     <entry>  |

Help/command/get_source_file_property.rst

@@ -5,7 +5,7 @@ Get a property for a source file.
 
 .. code-block:: cmake
 
-  get_source_file_property(VAR file [<TARGET_DIRECTORY ... | DIRECTORY ...>] property)
+  get_source_file_property(VAR file [TARGET_DIRECTORY <target> | DIRECTORY <dir>] property)
 
 Gets a property from a source file.  The value of the property is
 stored in the variable ``VAR``.  If the source property is not found, the

Help/command/set_property.rst

@@ -9,7 +9,8 @@ Set a named property in a given scope.
                 DIRECTORY [<dir>]           |
                 TARGET    [<target1> ...]   |
                 SOURCE    [<src1> ...]
-                          [<TARGET_DIRECTORY ... | DIRECTORY ...>]   |
+                          [TARGET_DIRECTORY <target1> ...]
+                          [DIRECTORY <dir1> ...] |
                 INSTALL   [<file1> ...]     |
                 TEST      [<test1> ...]     |
                 CACHE     [<entry1> ...]    >
@@ -38,7 +39,7 @@ It must be one of the following:
   file properties are by default visible only to targets added in the same
   directory (``CMakeLists.txt``).
   The file properties can be made visible in a different directory by specifying
-  one of the additional options: ``TARGET_DIRECTORY`` or ``DIRECTORY``.
+  one or both of the additional options: ``TARGET_DIRECTORY`` and ``DIRECTORY``.
 
   ``DIRECTORY`` takes a list of processed directories paths, and sets the file
   properties in those directory scopes.

Help/command/set_source_files_properties.rst

@@ -6,7 +6,8 @@ Source files can have properties that affect how they are built.
 .. code-block:: cmake
 
   set_source_files_properties([file1 [file2 [...]]]
-                              [<TARGET_DIRECTORY ... | DIRECTORY ...>]
+                              [TARGET_DIRECTORY <target1> ...]
+                              [DIRECTORY <dir1> ...]
                               PROPERTIES prop1 value1
                               [prop2 value2 [...]])
 
@@ -17,7 +18,7 @@ Note that source file properties are by default visible only to
 targets added in the same directory (``CMakeLists.txt``).
 
 The file properties can be made visible in a different directory by specifying
-one of the additional options: ``TARGET_DIRECTORY`` or ``DIRECTORY``.
+one or both of the additional options: ``TARGET_DIRECTORY`` and ``DIRECTORY``.
 
 ``DIRECTORY`` takes a list of processed directories paths, and sets the file
 properties in those directory scopes.