[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2637-gdbb49b6

[Brad King]

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  dbb49b62853ca86614abc5844c516ce1d9611112 (commit)
       via  a0b37d7e3bdf72db2d1c9f8fc11b6d6054a6d04f (commit)
      from  94d0c909d3d979fa7b9baeef84010169944138c6 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dbb49b62853ca86614abc5844c516ce1d9611112
commit dbb49b62853ca86614abc5844c516ce1d9611112
Merge: 94d0c90 a0b37d7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 17 08:45:19 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 17 08:45:19 2013 -0400

    Merge topic 'doc-search-install-prefix' into next
    
    a0b37d7 Document CMAKE_INSTALL_PREFIX in CMAKE_SYSTEM_PREFIX_PATH


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0b37d7e3bdf72db2d1c9f8fc11b6d6054a6d04f
commit a0b37d7e3bdf72db2d1c9f8fc11b6d6054a6d04f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 17 08:40:44 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 17 08:40:44 2013 -0400

    Document CMAKE_INSTALL_PREFIX in CMAKE_SYSTEM_PREFIX_PATH
    
    Add documentation to both variables to indicate that the install prefix
    is also searched.

diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index 689508f..ceaa302 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -648,6 +648,10 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
      "WARNING: DESTDIR may not be used on Windows because installation"
      " prefix usually contains a drive letter like in \"C:/Program Files\""
      " which cannot be prepended with some other prefix."
+     "\n"
+     "The installation prefix is also added to CMAKE_SYSTEM_PREFIX_PATH "
+     "so that find_package, find_program, find_library, find_path, and "
+     "find_file will search the prefix for other software."
      ,false,
      "Variables That Change Behavior");
 
@@ -725,7 +729,8 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
      "adds /bin to each of the directories in the path, FIND_LIBRARY() "
      "appends /lib to each of the directories, and FIND_PATH() and "
      "FIND_FILE() append /include . By default this contains the standard "
-     "directories for the current system. It is NOT intended "
+     "directories for the current system and the CMAKE_INSTALL_PREFIX.  "
+     "It is NOT intended "
      "to be modified by the project, use CMAKE_PREFIX_PATH for this. See also "
      "CMAKE_SYSTEM_INCLUDE_PATH, CMAKE_SYSTEM_LIBRARY_PATH, "
      "CMAKE_SYSTEM_PROGRAM_PATH, and CMAKE_SYSTEM_IGNORE_PATH.", false,

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

Summary of changes:
 Source/cmDocumentVariables.cxx |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake