[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-492-g47227ed

[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  47227ed33e343a5c30f88b92be1d79d654359cab (commit)
       via  46596c10169b40ed1bdf2b9300f1cc70c2642de9 (commit)
      from  6e5b15cb50a68da73cfb75aba5fda9d820707817 (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=47227ed33e343a5c30f88b92be1d79d654359cab
commit 47227ed33e343a5c30f88b92be1d79d654359cab
Merge: 6e5b15c 46596c1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 19 09:59:40 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 19 09:59:40 2015 -0500

    Merge topic 'find-command-prefix-from-PATH' into next
    
    46596c10 Tests: Fix RunCMake.find_* tests to save and restore PATH


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=46596c10169b40ed1bdf2b9300f1cc70c2642de9
commit 46596c10169b40ed1bdf2b9300f1cc70c2642de9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 19 09:58:04 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 09:58:04 2015 -0500

    Tests: Fix RunCMake.find_* tests to save and restore PATH
    
    On some machines we need the system tools to be available in PATH.

diff --git a/Tests/RunCMake/find_file/PrefixInPATH.cmake b/Tests/RunCMake/find_file/PrefixInPATH.cmake
index 79106e9..1e33c08 100644
--- a/Tests/RunCMake/find_file/PrefixInPATH.cmake
+++ b/Tests/RunCMake/find_file/PrefixInPATH.cmake
@@ -1,6 +1,8 @@
+set(ENV_PATH "$ENV{PATH}")
 foreach(path "/does_not_exist" "" "/bin" "/sbin")
   unset(PrefixInPATH_INCLUDE_DIR CACHE)
   set(ENV{PATH} "${CMAKE_CURRENT_SOURCE_DIR}${path}")
   find_file(PrefixInPATH_INCLUDE_DIR NAMES PrefixInPATH.h)
   message(STATUS "PrefixInPATH_INCLUDE_DIR='${PrefixInPATH_INCLUDE_DIR}'")
 endforeach()
+set(ENV{PATH} "${ENV_PATH}")
diff --git a/Tests/RunCMake/find_library/PrefixInPATH.cmake b/Tests/RunCMake/find_library/PrefixInPATH.cmake
index 6e37359..f1b8b18 100644
--- a/Tests/RunCMake/find_library/PrefixInPATH.cmake
+++ b/Tests/RunCMake/find_library/PrefixInPATH.cmake
@@ -1,9 +1,11 @@
 list(APPEND CMAKE_FIND_LIBRARY_PREFIXES lib)
 list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES .a)
 
+set(ENV_PATH "$ENV{PATH}")
 foreach(path "/does_not_exist" "" "/bin" "/sbin")
   unset(PrefixInPATH_LIBRARY CACHE)
   set(ENV{PATH} "${CMAKE_CURRENT_SOURCE_DIR}${path}")
   find_library(PrefixInPATH_LIBRARY NAMES PrefixInPATH)
   message(STATUS "PrefixInPATH_LIBRARY='${PrefixInPATH_LIBRARY}'")
 endforeach()
+set(ENV{PATH} "${ENV_PATH}")
diff --git a/Tests/RunCMake/find_path/PrefixInPATH.cmake b/Tests/RunCMake/find_path/PrefixInPATH.cmake
index a321910..614d64f 100644
--- a/Tests/RunCMake/find_path/PrefixInPATH.cmake
+++ b/Tests/RunCMake/find_path/PrefixInPATH.cmake
@@ -1,6 +1,8 @@
+set(ENV_PATH "$ENV{PATH}")
 foreach(path "/does_not_exist" "" "/bin" "/sbin")
   unset(PrefixInPATH_INCLUDE_DIR CACHE)
   set(ENV{PATH} "${CMAKE_CURRENT_SOURCE_DIR}${path}")
   find_path(PrefixInPATH_INCLUDE_DIR NAMES PrefixInPATH.h)
   message(STATUS "PrefixInPATH_INCLUDE_DIR='${PrefixInPATH_INCLUDE_DIR}'")
 endforeach()
+set(ENV{PATH} "${ENV_PATH}")

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

Summary of changes:
 Tests/RunCMake/find_file/PrefixInPATH.cmake    |    2 ++
 Tests/RunCMake/find_library/PrefixInPATH.cmake |    2 ++
 Tests/RunCMake/find_path/PrefixInPATH.cmake    |    2 ++
 3 files changed, 6 insertions(+)


hooks/post-receive
-- 
CMake