[Cmake-commits] CMake branch, next, updated. v3.0.2-2204-gc588e6c

[Chuck Atkins]

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  c588e6cfc1ddf624134dbcefd9377b3c578f4f60 (commit)
       via  43b8bfb213188b1017949b5c29f3071e455121e3 (commit)
      from  405cacfba1357412406a03fe794865072392459d (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=c588e6cfc1ddf624134dbcefd9377b3c578f4f60
commit c588e6cfc1ddf624134dbcefd9377b3c578f4f60
Merge: 405cacf 43b8bfb
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Sun Oct 26 00:09:34 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Oct 26 00:09:34 2014 -0400

    Merge topic 'find-boost-no-reroot' into next
    
    43b8bfb2 FindBoost: fix find_library call when using "re-rooting"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43b8bfb213188b1017949b5c29f3071e455121e3
commit 43b8bfb213188b1017949b5c29f3071e455121e3
Author:     Guillaume Papin <guillaume.papin at parrot.com>
AuthorDate: Thu Oct 23 09:10:54 2014 +0200
Commit:     Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Sun Oct 26 00:03:39 2014 -0400

    FindBoost: fix find_library call when using "re-rooting"
    
    When using CMAKE_FIND_ROOT_PATH, FindBoost is able to find the first
    component and cache the full path of the directory in Boost_LIBRARY_DIR
    so that all components are looked for in same directory. The issue was
    that, when looking for the other components, Boost_LIBRARY_DIR was
    re-rooted against CMAKE_FIND_ROOT_PATH even though it was already a path
    on the host. This change fixes this by disabling the re-rooting in the
    find_library call when using Boost_LIBRARY_DIR as a hint.
    
    See http://www.cmake.org/pipermail/cmake-developers/2014-October/011670.html

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 3642b3e..aad6575 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -321,7 +321,7 @@ macro(_Boost_FIND_LIBRARY var)
 
   # If Boost_LIBRARY_DIR is known then search only there.
   if(Boost_LIBRARY_DIR)
-    set(_boost_LIBRARY_SEARCH_DIRS ${Boost_LIBRARY_DIR} NO_DEFAULT_PATH)
+    set(_boost_LIBRARY_SEARCH_DIRS ${Boost_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
   endif()
 endmacro()
 
@@ -855,7 +855,7 @@ if(_Boost_CHANGE_LIBDIR AND NOT _Boost_LIBRARY_DIR_CHANGED)
 endif()
 
 if(Boost_LIBRARY_DIR)
-  set(_boost_LIBRARY_SEARCH_DIRS ${Boost_LIBRARY_DIR} NO_DEFAULT_PATH)
+  set(_boost_LIBRARY_SEARCH_DIRS ${Boost_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
 else()
   set(_boost_LIBRARY_SEARCH_DIRS "")
   if(BOOST_LIBRARYDIR)

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

Summary of changes:
 Modules/FindBoost.cmake |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake