summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-09-15 18:16:07 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-09-15 18:16:07 (GMT)
commit6e06a53ebf58f41cd570d1bbaed7a1c62eac7ed0 (patch)
tree3e2a3b11a18632c34ed7d7326cd833b4e2d13b2a
parent6a189675809aa3f43534fde47e5a094464892ead (diff)
parentc3507b54968cf5c1594b44f758da2c06c68b0717 (diff)
downloadCMake-6e06a53ebf58f41cd570d1bbaed7a1c62eac7ed0.zip
CMake-6e06a53ebf58f41cd570d1bbaed7a1c62eac7ed0.tar.gz
CMake-6e06a53ebf58f41cd570d1bbaed7a1c62eac7ed0.tar.bz2
Merge topic 'doc-CMP0017'
c3507b54 Help: Clarify wording of include() for builtin module directories
-rw-r--r--Help/command/include.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Help/command/include.rst b/Help/command/include.rst
index c391561..eeca4c6 100644
--- a/Help/command/include.rst
+++ b/Help/command/include.rst
@@ -15,10 +15,10 @@ is present, then no error is raised if the file does not exist. If
which has been included or NOTFOUND if it failed.
If a module is specified instead of a file, the file with name
-<modulename>.cmake is searched first in :variable:`CMAKE_MODULE_PATH`,
+``<modulename>.cmake`` is searched first in :variable:`CMAKE_MODULE_PATH`,
then in the CMake module directory. There is one exception to this: if
-the file which calls ``include()`` is located itself in the CMake module
-directory, then first the CMake module directory is searched and
+the file which calls ``include()`` is located itself in the CMake builtin
+module directory, then first the CMake builtin module directory is searched and
:variable:`CMAKE_MODULE_PATH` afterwards. See also policy :policy:`CMP0017`.
See the :command:`cmake_policy` command documentation for discussion of the