summaryrefslogtreecommitdiffstats
path: root/Help/command
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-04-06 12:58:23 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-04-06 12:58:23 (GMT)
commit156d3f8903057ba92195f442cc1d0dd817731bc8 (patch)
treefda850e8581026ce22ba89cd1abb3d79194dce95 /Help/command
parentdfbde6fa991e60853a9f7ad165c4b8c8416a9ba4 (diff)
parent6f82b5e81ca9677dc2fde855ba7be8e235baa667 (diff)
downloadCMake-156d3f8903057ba92195f442cc1d0dd817731bc8.zip
CMake-156d3f8903057ba92195f442cc1d0dd817731bc8.tar.gz
CMake-156d3f8903057ba92195f442cc1d0dd817731bc8.tar.bz2
Merge topic 'improve-properties-help'
6f82b5e8 Help: Link to properties in set_tests_properties. 66f5af29 Help: Link to properties in set_directory_properties docs. f7dd3f7c Help: Add link in set_source_files_properties command docs. 3b256173 Help: Shorten too-long title marker. 8fc3a2fb Help: Add references to cmake-property sections.
Diffstat (limited to 'Help/command')
-rw-r--r--Help/command/set_directory_properties.rst9
-rw-r--r--Help/command/set_source_files_properties.rst6
-rw-r--r--Help/command/set_tests_properties.rst30
3 files changed, 10 insertions, 35 deletions
diff --git a/Help/command/set_directory_properties.rst b/Help/command/set_directory_properties.rst
index 834013a..e485fce 100644
--- a/Help/command/set_directory_properties.rst
+++ b/Help/command/set_directory_properties.rst
@@ -7,9 +7,6 @@ Set a property of the directory.
set_directory_properties(PROPERTIES prop1 value1 prop2 value2)
-Set a property for the current directory and subdirectories. If the
-property is not found, CMake will report an error. The properties
-include: INCLUDE_DIRECTORIES, LINK_DIRECTORIES,
-INCLUDE_REGULAR_EXPRESSION, and ADDITIONAL_MAKE_CLEAN_FILES.
-ADDITIONAL_MAKE_CLEAN_FILES is a list of files that will be cleaned as
-a part of "make clean" stage.
+Set a property for the current directory and subdirectories. See
+:ref:`Directory Properties` for the list of properties known
+to CMake.
diff --git a/Help/command/set_source_files_properties.rst b/Help/command/set_source_files_properties.rst
index 8ea02a3..b4904e8 100644
--- a/Help/command/set_source_files_properties.rst
+++ b/Help/command/set_source_files_properties.rst
@@ -10,6 +10,6 @@ Source files can have properties that affect how they are built.
[prop2 value2 [...]])
Set properties associated with source files using a key/value paired
-list. See properties documentation for those known to CMake.
-Unrecognized properties are ignored. Source file properties are
-visible only to targets added in the same directory (CMakeLists.txt).
+list. See :ref:`Source File Properties` for the list of properties known
+to CMake. Source file properties are visible only to targets added
+in the same directory (CMakeLists.txt).
diff --git a/Help/command/set_tests_properties.rst b/Help/command/set_tests_properties.rst
index afac847..3efb165 100644
--- a/Help/command/set_tests_properties.rst
+++ b/Help/command/set_tests_properties.rst
@@ -8,29 +8,7 @@ Set a property of the tests.
set_tests_properties(test1 [test2...] PROPERTIES prop1 value1 prop2 value2)
Set a property for the tests. If the test is not found, CMake
-will report an error. Generator expressions will be expanded the same
-as supported by the test's add_test call. The properties include:
-
-WILL_FAIL: If set to true, this will invert the pass/fail flag of the
-test.
-
-PASS_REGULAR_EXPRESSION: If set, the test output will be checked
-against the specified regular expressions and at least one of the
-regular expressions has to match, otherwise the test will fail.
-
-::
-
- Example: PASS_REGULAR_EXPRESSION "TestPassed;All ok"
-
-FAIL_REGULAR_EXPRESSION: If set, if the output will match to one of
-specified regular expressions, the test will fail.
-
-::
-
- Example: FAIL_REGULAR_EXPRESSION "[^a-z]Error;ERROR;Failed"
-
-Both PASS_REGULAR_EXPRESSION and FAIL_REGULAR_EXPRESSION expect a list
-of regular expressions.
-
-TIMEOUT: Setting this will limit the test runtime to the number of
-seconds specified.
+will report an error.
+:manual:`Generator expressions <cmake-generator-expressions(7)>` will be
+expanded the same as supported by the test's :command:`add_test` call. See
+:ref:`Test Properties` for the list of properties known to CMake.