diff options
author | Brad King <brad.king@kitware.com> | 2014-11-06 19:48:45 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-11-06 19:52:49 (GMT) |
commit | 67c4be51a34f86d4c26fa9f1f2f79f5539493eee (patch) | |
tree | e44eefd24b5b5b6931c3783b911e62e5be77f9af /Help/manual/cmake-packages.7.rst | |
parent | 917da5d02766e875ec63eca09eb52b789114674c (diff) | |
parent | 79349ed8fc22f70de7f839b2323cf3e93aca9bc9 (diff) | |
download | CMake-67c4be51a34f86d4c26fa9f1f2f79f5539493eee.zip CMake-67c4be51a34f86d4c26fa9f1f2f79f5539493eee.tar.gz CMake-67c4be51a34f86d4c26fa9f1f2f79f5539493eee.tar.bz2 |
Merge branch 'release-doc-formatting' into doc-formatting
Resolve conflict in Modules/ExternalProject.cmake by keeping our side,
which is more completely revised.
Diffstat (limited to 'Help/manual/cmake-packages.7.rst')
-rw-r--r-- | Help/manual/cmake-packages.7.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Help/manual/cmake-packages.7.rst b/Help/manual/cmake-packages.7.rst index 5d6201c..5e4f0ea 100644 --- a/Help/manual/cmake-packages.7.rst +++ b/Help/manual/cmake-packages.7.rst @@ -3,7 +3,7 @@ cmake-packages(7) ***************** -.. only:: html or latex +.. only:: html .. contents:: @@ -479,7 +479,7 @@ be true. This can be tested with logic in the package configuration file: foreach(_comp ${ClimbingStats_FIND_COMPONENTS}) if (NOT ";${_supported_components};" MATCHES _comp) set(ClimbingStats_FOUND False) - set(ClimbingStats_NOTFOUND_MESSAGE "Specified unsupported component: ${_comp}") + set(ClimbingStats_NOTFOUND_MESSAGE "Unsupported component: ${_comp}") endif() include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStats${_comp}Targets.cmake") endforeach() |