diff options
| author | Brad King <brad.king@kitware.com> | 2020-07-10 10:43:58 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-07-10 10:45:09 (GMT) |
| commit | a5064f6e656f3c83c5aa78af67740365f08236fb (patch) | |
| tree | 4c10ffe5c3743b8576218f82c1efd2e1a312ca96 /Help | |
| parent | bf3a1e9a9b51cd6116d416148abfec2765cdef10 (diff) | |
| parent | 961ee62faaf63cbd72724a4e9c039352ed44dad4 (diff) | |
| download | CMake-a5064f6e656f3c83c5aa78af67740365f08236fb.zip CMake-a5064f6e656f3c83c5aa78af67740365f08236fb.tar.gz CMake-a5064f6e656f3c83c5aa78af67740365f08236fb.tar.bz2 | |
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
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/command/get_property.rst | 2 | ||||
| -rw-r--r-- | Help/command/get_source_file_property.rst | 2 | ||||
| -rw-r--r-- | Help/command/set_property.rst | 5 | ||||
| -rw-r--r-- | Help/command/set_source_files_properties.rst | 5 |
4 files changed, 8 insertions, 6 deletions
diff --git a/Help/command/get_property.rst b/Help/command/get_property.rst index 80d97fd..123cd45 100644 --- a/Help/command/get_property.rst +++ b/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> | diff --git a/Help/command/get_source_file_property.rst b/Help/command/get_source_file_property.rst index 893a1b6..1060251 100644 --- a/Help/command/get_source_file_property.rst +++ b/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 diff --git a/Help/command/set_property.rst b/Help/command/set_property.rst index de28be3..ccbd635 100644 --- a/Help/command/set_property.rst +++ b/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. diff --git a/Help/command/set_source_files_properties.rst b/Help/command/set_source_files_properties.rst index 8adfb9e..59d5ba3 100644 --- a/Help/command/set_source_files_properties.rst +++ b/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. |