diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-10 12:59:32 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-02-10 12:59:32 -0500 |
| commit | 0a95c5ce2ef8d9887c4a0bdde480155d75f12c7b (patch) | |
| tree | 5c041f7c222b64846680c7e94d435ace46daba0b | |
| parent | f3a6e0cb6a96ca2c3e363371c17940d5cb2ed791 (diff) | |
| parent | 56cb4a6c3a71f1a3d3e0dccbdc593bc58d76c5ee (diff) | |
| download | cmake-0a95c5ce2ef8d9887c4a0bdde480155d75f12c7b.tar.gz | |
Merge branch 'fix_timeout_docs' into release
| -rw-r--r-- | Help/prop_test/TIMEOUT.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Help/prop_test/TIMEOUT.rst b/Help/prop_test/TIMEOUT.rst index 0b247b8601..d1cb90d0ac 100644 --- a/Help/prop_test/TIMEOUT.rst +++ b/Help/prop_test/TIMEOUT.rst @@ -6,4 +6,4 @@ How many seconds to allow for this test. This property if set will limit a test to not take more than the specified number of seconds to run. If it exceeds that the test process will be killed and ctest will move to the next test. This -setting takes precedence over CTEST_TESTING_TIMEOUT. +setting takes precedence over :variable:`CTEST_TEST_TIMEOUT`. |