diff options
| author | Brad King <brad.king@kitware.com> | 2017-07-13 11:45:54 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-07-13 11:46:09 (GMT) |
| commit | f5be951117711a3965db0f9cd59a2913efacece7 (patch) | |
| tree | 0fa922865dcd8eb881af99c4ce50c03f3cc8a399 /Help/manual/cmake-variables.7.rst | |
| parent | 37915a69304d0de36e15b024380a7ddabeb0d821 (diff) | |
| parent | 376dc3eb2218c64db50ae53c04376dfb42c538ba (diff) | |
| download | CMake-f5be951117711a3965db0f9cd59a2913efacece7.zip CMake-f5be951117711a3965db0f9cd59a2913efacece7.tar.gz CMake-f5be951117711a3965db0f9cd59a2913efacece7.tar.bz2 | |
Merge topic 'labels-for-subprojects'
376dc3eb Help: Add notes for topic 'labels_for_subprojects'
a70d8e93 Add tests for new directory labels and labels-for-subprojects features
47b3a57c Display subproject timing summary
d3859624 Add directory property 'LABELS' and CMAKE_DIRECTORY_LABELS variable
d08ec4d2 Add CTEST_LABELS_FOR_SUBPROJECTS as a CTest module and script variable
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1004
Diffstat (limited to 'Help/manual/cmake-variables.7.rst')
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index cc16b23..363b90f 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -32,6 +32,7 @@ Variables that Provide Information /variable/CMAKE_CURRENT_LIST_FILE /variable/CMAKE_CURRENT_LIST_LINE /variable/CMAKE_CURRENT_SOURCE_DIR + /variable/CMAKE_DIRECTORY_LABELS /variable/CMAKE_DL_LIBS /variable/CMAKE_EDIT_COMMAND /variable/CMAKE_EXECUTABLE_SUFFIX @@ -482,6 +483,7 @@ Variables for CTest /variable/CTEST_GIT_UPDATE_OPTIONS /variable/CTEST_HG_COMMAND /variable/CTEST_HG_UPDATE_OPTIONS + /variable/CTEST_LABELS_FOR_SUBPROJECTS /variable/CTEST_MEMORYCHECK_COMMAND /variable/CTEST_MEMORYCHECK_COMMAND_OPTIONS /variable/CTEST_MEMORYCHECK_SANITIZER_OPTIONS |