diff options
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/command/file.rst | 4 | ||||
| -rw-r--r-- | Help/manual/ctest.1.rst | 13 | ||||
| -rw-r--r-- | Help/prop_tgt/FRAMEWORK_MULTI_CONFIG_POSTFIX_CONFIG.rst | 2 | ||||
| -rw-r--r-- | Help/variable/CTEST_RESOURCE_SPEC_FILE.rst | 5 |
4 files changed, 18 insertions, 6 deletions
diff --git a/Help/command/file.rst b/Help/command/file.rst index c1a2032..e7bc8d2 100644 --- a/Help/command/file.rst +++ b/Help/command/file.rst @@ -43,8 +43,8 @@ Synopsis file(`LOCK`_ <path> [...]) `Archiving`_ - file(`ARCHIVE_CREATE`_ OUTPUT <archive> FILES <files> [...]) - file(`ARCHIVE_EXTRACT`_ INPUT <archive> DESTINATION <dir> [...]) + file(`ARCHIVE_CREATE`_ OUTPUT <archive> PATHS <paths>... [...]) + file(`ARCHIVE_EXTRACT`_ INPUT <archive> [...]) Reading ^^^^^^^ diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst index 5f953b3..d3ab75a 100644 --- a/Help/manual/ctest.1.rst +++ b/Help/manual/ctest.1.rst @@ -1410,9 +1410,16 @@ Resource Specification File The resource specification file is a JSON file which is passed to CTest, either on the :manual:`ctest(1)` command line as ``--resource-spec-file``, or as the -``RESOURCE_SPEC_FILE`` argument of :command:`ctest_test`. The resource -specification file must be a JSON object. All examples in this document assume -the following resource specification file: +``RESOURCE_SPEC_FILE`` argument of :command:`ctest_test`. If a dashboard script +is used and ``RESOURCE_SPEC_FILE`` is not specified, the value of +:variable:`CTEST_RESOURCE_SPEC_FILE` in the dashboard script is used instead. +If ``--resource-spec-file``, ``RESOURCE_SPEC_FILE``, and +:variable:`CTEST_RESOURCE_SPEC_FILE` in the dashboard script are not specified, +the value of :variable:`CTEST_RESOURCE_SPEC_FILE` in the CMake build is used +instead. If none of these are specified, no resource spec file is used. + +The resource specification file must be a JSON object. All examples in this +document assume the following resource specification file: .. code-block:: json diff --git a/Help/prop_tgt/FRAMEWORK_MULTI_CONFIG_POSTFIX_CONFIG.rst b/Help/prop_tgt/FRAMEWORK_MULTI_CONFIG_POSTFIX_CONFIG.rst index 5d0fc3d..243c0cd 100644 --- a/Help/prop_tgt/FRAMEWORK_MULTI_CONFIG_POSTFIX_CONFIG.rst +++ b/Help/prop_tgt/FRAMEWORK_MULTI_CONFIG_POSTFIX_CONFIG.rst @@ -8,7 +8,7 @@ When building with configuration ``<CONFIG>`` the value of this property is appended to the framework file name built on disk. For example, given a framework called ``my_fw``, a value of ``_debug`` -for the ``FRAMEWORK_MULTI_CONFIG_POSTFIX_<CONFIG>`` property, and +for the ``FRAMEWORK_MULTI_CONFIG_POSTFIX_DEBUG`` property, and ``Debug;Release`` in :variable:`CMAKE_CONFIGURATION_TYPES`, the following relevant files would be created for the ``Debug`` and ``Release`` configurations: diff --git a/Help/variable/CTEST_RESOURCE_SPEC_FILE.rst b/Help/variable/CTEST_RESOURCE_SPEC_FILE.rst index 59f365f..a6fdbc9 100644 --- a/Help/variable/CTEST_RESOURCE_SPEC_FILE.rst +++ b/Help/variable/CTEST_RESOURCE_SPEC_FILE.rst @@ -3,3 +3,8 @@ CTEST_RESOURCE_SPEC_FILE Specify the CTest ``ResourceSpecFile`` setting in a :manual:`ctest(1)` dashboard client script. + +This can also be used to specify the resource spec file from a CMake build. If +no ``RESOURCE_SPEC_FILE`` is passed to :command:`ctest_test`, and +``CTEST_RESOURCE_SPEC_FILE`` is not specified in the dashboard script, the +value of this variable from the build is used. |