[Cmake-commits] CMake branch, next, updated. v3.8.0-803-g1ca3319

Kitware Robot kwrobot at kitware.com
Tue Apr 18 14:35:02 EDT 2017


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  1ca3319d0d31fa45cfbdf7d28dc848b55aca849e (commit)
       via  3022545f14a38d07105de0555c75e445c5b587a6 (commit)
      from  23e99f9b65eb8fdf8bbd117117199f427a53da33 (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=1ca3319d0d31fa45cfbdf7d28dc848b55aca849e
commit 1ca3319d0d31fa45cfbdf7d28dc848b55aca849e
Merge: 23e99f9 3022545
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 18 18:26:33 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Apr 18 14:26:38 2017 -0400

    Stage topic 'doc-find-path-sep'
    
    Topic-id: 23747
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/718


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3022545f14a38d07105de0555c75e445c5b587a6
commit 3022545f14a38d07105de0555c75e445c5b587a6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 18 14:22:20 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Apr 18 14:22:20 2017 -0400

    Help: Document find command search path separators
    
    The `find_*` commands read search paths from both CMake variables
    and from environment variables.  Document how multiple values in
    these variables should be separated.
    
    Fixes: #16800

diff --git a/Help/command/FIND_XXX.txt b/Help/command/FIND_XXX.txt
index bd4d295..2f27764 100644
--- a/Help/command/FIND_XXX.txt
+++ b/Help/command/FIND_XXX.txt
@@ -73,6 +73,7 @@ If ``NO_DEFAULT_PATH`` is not specified, the search process is as follows:
 
 1. Search paths specified in cmake-specific cache variables.
    These are intended to be used on the command line with a ``-DVAR=value``.
+   The values are interpreted as :ref:`;-lists <CMake Language Lists>`.
    This can be skipped if ``NO_CMAKE_PATH`` is passed.
 
    * |CMAKE_PREFIX_PATH_XXX|
@@ -80,7 +81,9 @@ If ``NO_DEFAULT_PATH`` is not specified, the search process is as follows:
    * |CMAKE_XXX_MAC_PATH|
 
 2. Search paths specified in cmake-specific environment variables.
-   These are intended to be set in the user's shell configuration.
+   These are intended to be set in the user's shell configuration,
+   and therefore use the host's native path separator
+   (``;`` on Windows and ``:`` on UNIX).
    This can be skipped if ``NO_CMAKE_ENVIRONMENT_PATH`` is passed.
 
    * |CMAKE_PREFIX_PATH_XXX|
diff --git a/Help/command/find_package.rst b/Help/command/find_package.rst
index 2cb1e5f..60a77b8 100644
--- a/Help/command/find_package.rst
+++ b/Help/command/find_package.rst
@@ -251,6 +251,7 @@ enabled.
 
 1. Search paths specified in cmake-specific cache variables.  These
    are intended to be used on the command line with a ``-DVAR=value``.
+   The values are interpreted as :ref:`;-lists <CMake Language Lists>`.
    This can be skipped if ``NO_CMAKE_PATH`` is passed::
 
      CMAKE_PREFIX_PATH
@@ -258,7 +259,9 @@ enabled.
      CMAKE_APPBUNDLE_PATH
 
 2. Search paths specified in cmake-specific environment variables.
-   These are intended to be set in the user's shell configuration.
+   These are intended to be set in the user's shell configuration,
+   and therefore use the host's native path separator
+   (``;`` on Windows and ``:`` on UNIX).
    This can be skipped if ``NO_CMAKE_ENVIRONMENT_PATH`` is passed::
 
      <package>_DIR

-----------------------------------------------------------------------

Summary of changes:
 Help/command/FIND_XXX.txt     |    5 ++++-
 Help/command/find_package.rst |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list