diff options
| author | Brad King <brad.king@kitware.com> | 2020-04-06 12:26:30 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-04-06 12:26:40 (GMT) |
| commit | 2b9e3abcb5f55fa74ff50979176545da6c56e368 (patch) | |
| tree | 1aed957434ad3b3656c40f837f3b7b6cb14841ff /Help | |
| parent | 0bc64c450c2fa485e5f1a5a7fea3efec97c84a3f (diff) | |
| parent | 060d2ce26914e7a5ff6632869556f3c67d88940c (diff) | |
| download | CMake-2b9e3abcb5f55fa74ff50979176545da6c56e368.zip CMake-2b9e3abcb5f55fa74ff50979176545da6c56e368.tar.gz CMake-2b9e3abcb5f55fa74ff50979176545da6c56e368.tar.bz2 | |
Merge topic 'ctest-resource-file-cache'
060d2ce269 CTest: Add CTEST_RESOURCE_SPEC_FILE variable
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4564
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 1 | ||||
| -rw-r--r-- | Help/manual/ctest.1.rst | 8 | ||||
| -rw-r--r-- | Help/release/dev/ctest_resource_spec_file-variable.rst | 6 | ||||
| -rw-r--r-- | Help/variable/CTEST_RESOURCE_SPEC_FILE.rst | 5 |
4 files changed, 18 insertions, 2 deletions
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 62c301c..1642772 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -623,6 +623,7 @@ Variables for CTest /variable/CTEST_P4_COMMAND /variable/CTEST_P4_OPTIONS /variable/CTEST_P4_UPDATE_OPTIONS + /variable/CTEST_RESOURCE_SPEC_FILE /variable/CTEST_RUN_CURRENT_SCRIPT /variable/CTEST_SCP_COMMAND /variable/CTEST_SITE diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst index 6503f0e..f2033b7 100644 --- a/Help/manual/ctest.1.rst +++ b/Help/manual/ctest.1.rst @@ -994,8 +994,12 @@ Configuration settings include: ``ResourceSpecFile`` Specify a - :ref:`resource specification file <ctest-resource-specification-file>`. See - :ref:`ctest-resource-allocation` for more information. + :ref:`resource specification file <ctest-resource-specification-file>`. + + * `CTest Script`_ variable: :variable:`CTEST_RESOURCE_SPEC_FILE` + * :module:`CTest` module variable: ``CTEST_RESOURCE_SPEC_FILE`` + + See :ref:`ctest-resource-allocation` for more information. ``LabelsForSubprojects`` Specify a semicolon-separated list of labels that will be treated as diff --git a/Help/release/dev/ctest_resource_spec_file-variable.rst b/Help/release/dev/ctest_resource_spec_file-variable.rst new file mode 100644 index 0000000..2ddf854 --- /dev/null +++ b/Help/release/dev/ctest_resource_spec_file-variable.rst @@ -0,0 +1,6 @@ +ctest_resource_spec_file-variable +--------------------------------- + +* :manual:`ctest(1)` gained a new :variable:`CTEST_RESOURCE_SPEC_FILE` + variable, which can be used to specify a + :ref:`resource specification file <ctest-resource-specification-file>`. diff --git a/Help/variable/CTEST_RESOURCE_SPEC_FILE.rst b/Help/variable/CTEST_RESOURCE_SPEC_FILE.rst new file mode 100644 index 0000000..59f365f --- /dev/null +++ b/Help/variable/CTEST_RESOURCE_SPEC_FILE.rst @@ -0,0 +1,5 @@ +CTEST_RESOURCE_SPEC_FILE +------------------------ + +Specify the CTest ``ResourceSpecFile`` setting in a :manual:`ctest(1)` +dashboard client script. |