[Cmake-commits] CMake branch, next, updated. v2.8.12-4623-g3ea2128

[Stephen Kelly]

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  3ea2128640d59859045809e29ee4df9f14e4307c (commit)
       via  f0cfbadef0ca5d6ff771a2dd0dbf45ef90fbe79d (commit)
       via  c2938c1f05a20c41269c8322c12b9dc54a60ef71 (commit)
      from  d779837e200e1b046fdaa7aa80743ad1de0a5361 (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=3ea2128640d59859045809e29ee4df9f14e4307c
commit 3ea2128640d59859045809e29ee4df9f14e4307c
Merge: d779837 f0cfbad
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 29 09:58:20 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 29 09:58:20 2013 -0400

    Merge topic 'add-CMAKE_FIND_NO_INSTALL_PREFIX' into next
    
    f0cfbad Add documentation.
    c2938c1 Use CMAKE_FIND_NO_INSTALL_PREFIX for another Windows path.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0cfbadef0ca5d6ff771a2dd0dbf45ef90fbe79d
commit f0cfbadef0ca5d6ff771a2dd0dbf45ef90fbe79d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 29 14:56:15 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 29 14:56:15 2013 +0100

    Add documentation.

diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 22a1c4d..157c38d 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -88,6 +88,7 @@ Variables that Change Behavior
    /variable/CMAKE_FIND_LIBRARY_PREFIXES
    /variable/CMAKE_FIND_LIBRARY_SUFFIXES
    /variable/CMAKE_FIND_PACKAGE_WARN_NO_MODULE
+   /variable/CMAKE_FIND_NO_INSTALL_PREFIX
    /variable/CMAKE_IGNORE_PATH
    /variable/CMAKE_INCLUDE_PATH
    /variable/CMAKE_INSTALL_DEFAULT_COMPONENT_NAME
diff --git a/Help/variable/CMAKE_FIND_NO_INSTALL_PREFIX.rst b/Help/variable/CMAKE_FIND_NO_INSTALL_PREFIX.rst
new file mode 100644
index 0000000..91231b0
--- /dev/null
+++ b/Help/variable/CMAKE_FIND_NO_INSTALL_PREFIX.rst
@@ -0,0 +1,13 @@
+CMAKE_FIND_NO_INSTALL_PREFIX
+----------------------------
+
+Ignore the :variable:`CMAKE_INSTALL_PREFIX` when searching for assets.
+
+CMake adds the :variable:`CMAKE_INSTALL_PREFIX` to the
+:variable:`CMAKE_SYSTEM_PREFIX_PATH` by default. This variable may be set
+on the command line to control that behavior.
+
+Set :variable:`CMAKE_FIND_NO_INSTALL_PREFIX` to TRUE to tell find_package not
+to search in the :variable:`CMAKE_INSTALL_PREFIX` by default.  Note that the
+prefix may still be searched for other reasons, such as being the same prefix
+as the CMake installation, or for being a built-in system prefix.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2938c1f05a20c41269c8322c12b9dc54a60ef71
commit c2938c1f05a20c41269c8322c12b9dc54a60ef71
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 29 14:49:41 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 29 14:49:41 2013 +0100

    Use CMAKE_FIND_NO_INSTALL_PREFIX for another Windows path.

diff --git a/Modules/Platform/WindowsPaths.cmake b/Modules/Platform/WindowsPaths.cmake
index e08bb37..c231495 100644
--- a/Modules/Platform/WindowsPaths.cmake
+++ b/Modules/Platform/WindowsPaths.cmake
@@ -90,8 +90,12 @@ list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
   )
 
 # mingw can also link against dlls which can also be in /bin, so list this too
+if (NOT CMAKE_FIND_NO_INSTALL_PREFIX)
+  list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
+    "${CMAKE_INSTALL_PREFIX}/bin"
+  )
+endif()
 list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
-  "${CMAKE_INSTALL_PREFIX}/bin"
   "${_CMAKE_INSTALL_DIR}/bin"
   /bin
   )

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

Summary of changes:
 Help/manual/cmake-variables.7.rst              |    1 +
 Help/variable/CMAKE_FIND_NO_INSTALL_PREFIX.rst |   13 +++++++++++++
 Modules/Platform/WindowsPaths.cmake            |    6 +++++-
 3 files changed, 19 insertions(+), 1 deletions(-)
 create mode 100644 Help/variable/CMAKE_FIND_NO_INSTALL_PREFIX.rst


hooks/post-receive
-- 
CMake