[Cmake-commits] CMake branch, next, updated. v3.6.2-2085-g2471d0e
Brad King
brad.king at kitware.com
Thu Sep 15 14:03:11 EDT 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 2471d0eceab00020e76b20ed7cc06d4df0929726 (commit)
via c3507b54968cf5c1594b44f758da2c06c68b0717 (commit)
from eb8d2dca610df895a5e069b8377f425caa0a4e81 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2471d0eceab00020e76b20ed7cc06d4df0929726
commit 2471d0eceab00020e76b20ed7cc06d4df0929726
Merge: eb8d2dc c3507b5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 15 14:03:10 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 15 14:03:10 2016 -0400
Merge topic 'doc-CMP0017' into next
c3507b54 Help: Clarify wording of include() for builtin module directories
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c3507b54968cf5c1594b44f758da2c06c68b0717
commit c3507b54968cf5c1594b44f758da2c06c68b0717
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 15 14:01:13 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 15 14:02:25 2016 -0400
Help: Clarify wording of include() for builtin module directories
Issue: #16312
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
-----------------------------------------------------------------------
Summary of changes:
Help/command/include.rst | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list