diff options
| author | Brad King <brad.king@kitware.com> | 2019-11-05 17:59:16 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-11-05 17:59:16 (GMT) |
| commit | 016601e5e6f152403306c12997534aadd4287d38 (patch) | |
| tree | 64af20c4200fd44061789bcb9bf6842fd8cb5ab0 /Help/manual/cmake-properties.7.rst | |
| parent | 370fe1495b4109430b2cb250dd3afd1ce9401cf6 (diff) | |
| parent | c1435d98120dff203de01d75f8f91e99bc75fe2b (diff) | |
| download | CMake-016601e5e6f152403306c12997534aadd4287d38.zip CMake-016601e5e6f152403306c12997534aadd4287d38.tar.gz CMake-016601e5e6f152403306c12997534aadd4287d38.tar.bz2 | |
Merge branch 'backport-ctest-resource-groups'
Diffstat (limited to 'Help/manual/cmake-properties.7.rst')
| -rw-r--r-- | Help/manual/cmake-properties.7.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst index 02e07eb..675b65c 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -415,10 +415,10 @@ Properties on Tests /prop_test/LABELS /prop_test/MEASUREMENT /prop_test/PASS_REGULAR_EXPRESSION - /prop_test/PROCESSES /prop_test/PROCESSOR_AFFINITY /prop_test/PROCESSORS /prop_test/REQUIRED_FILES + /prop_test/RESOURCE_GROUPS /prop_test/RESOURCE_LOCK /prop_test/RUN_SERIAL /prop_test/SKIP_REGULAR_EXPRESSION |