[Cmake-commits] CMake branch, next, updated. v3.5.2-1182-gf80f30d

[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  f80f30d3a1d3cdb669fe6405e2971ae038af1829 (commit)
       via  5a9b2b3b116a401b752a7a48c0bcae56eb2bf89b (commit)
      from  0121aecb636f5fee00290bdcd18ea1e3011fb5a3 (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=f80f30d3a1d3cdb669fe6405e2971ae038af1829
commit f80f30d3a1d3cdb669fe6405e2971ae038af1829
Merge: 0121aec 5a9b2b3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 2 11:44:53 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 2 11:44:53 2016 -0400

    Merge topic 'FindBoost-no-system-env-paths' into next
    
    5a9b2b3b FindBoost: Fix Boost_NO_SYSTEM_PATHS to not consider environment (#15702)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a9b2b3b116a401b752a7a48c0bcae56eb2bf89b
commit 5a9b2b3b116a401b752a7a48c0bcae56eb2bf89b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 2 11:40:01 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 2 11:43:28 2016 -0400

    FindBoost: Fix Boost_NO_SYSTEM_PATHS to not consider environment (#15702)
    
    Previously we added only NO_CMAKE_SYSTEM_PATH to find command calls.
    Add NO_SYSTEM_ENVIRONMENT_PATH too so that paths found from system
    environment variables are not considered either.

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 38ccf78..3d573b8 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -982,7 +982,7 @@ if(NOT Boost_INCLUDE_DIR)
   endif()
 
   if( Boost_NO_SYSTEM_PATHS)
-    list(APPEND _boost_INCLUDE_SEARCH_DIRS NO_CMAKE_SYSTEM_PATH)
+    list(APPEND _boost_INCLUDE_SEARCH_DIRS NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH)
   else()
     list(APPEND _boost_INCLUDE_SEARCH_DIRS PATHS
       C:/boost/include
@@ -1251,7 +1251,7 @@ foreach(c DEBUG RELEASE)
       ${Boost_INCLUDE_DIR}/stage/lib
       )
     if( Boost_NO_SYSTEM_PATHS )
-      list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} NO_CMAKE_SYSTEM_PATH)
+      list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH)
     else()
       list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} PATHS
         C:/boost/lib

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

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


hooks/post-receive
-- 
CMake