[Cmake-commits] CMake branch, next, updated. v3.3.1-2939-gad0aec2

[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  ad0aec244b522a1e5d7cf36227bd476524f80d8e (commit)
       via  c5d4c36737b09e00c2570b0842467573eb66bb51 (commit)
      from  bf2541a9c24d1b9631552e2b803192bd3fcdf7a4 (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=ad0aec244b522a1e5d7cf36227bd476524f80d8e
commit ad0aec244b522a1e5d7cf36227bd476524f80d8e
Merge: bf2541a c5d4c36
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 15 08:51:48 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 15 08:51:48 2015 -0400

    Merge topic 'fix-bad-search-ordering-for-master' into next
    
    c5d4c367 fixup! Tests: Cover find_program when the environment duplicate some HINTS


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5d4c36737b09e00c2570b0842467573eb66bb51
commit c5d4c36737b09e00c2570b0842467573eb66bb51
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 15 08:51:38 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 15 08:51:38 2015 -0400

    fixup! Tests: Cover find_program when the environment duplicate some HINTS

diff --git a/Tests/RunCMake/find_program/A/test b/Tests/RunCMake/find_program/A/testAandB
similarity index 100%
rename from Tests/RunCMake/find_program/A/test
rename to Tests/RunCMake/find_program/A/testAandB
diff --git a/Tests/RunCMake/find_program/B/test b/Tests/RunCMake/find_program/B/testAandB
similarity index 100%
rename from Tests/RunCMake/find_program/B/test
rename to Tests/RunCMake/find_program/B/testAandB
diff --git a/Tests/RunCMake/find_program/EnvAndHints-stdout.txt b/Tests/RunCMake/find_program/EnvAndHints-stdout.txt
index 113263e..39329b2 100644
--- a/Tests/RunCMake/find_program/EnvAndHints-stdout.txt
+++ b/Tests/RunCMake/find_program/EnvAndHints-stdout.txt
@@ -1 +1 @@
--- PROG='[^']*/Tests/RunCMake/find_program/A/test'
+-- PROG='[^']*/Tests/RunCMake/find_program/A/testAandB'
diff --git a/Tests/RunCMake/find_program/EnvAndHints.cmake b/Tests/RunCMake/find_program/EnvAndHints.cmake
index 3e30157..14ebd6e 100644
--- a/Tests/RunCMake/find_program/EnvAndHints.cmake
+++ b/Tests/RunCMake/find_program/EnvAndHints.cmake
@@ -1,6 +1,8 @@
+set(ENV_PATH "$ENV{PATH}")
 set(ENV{PATH} ${CMAKE_CURRENT_SOURCE_DIR}/A)
 find_program(PROG
-  NAMES test
+  NAMES testAandB
   HINTS ${CMAKE_CURRENT_SOURCE_DIR}/A ${CMAKE_CURRENT_SOURCE_DIR}/B
   )
 message(STATUS "PROG='${PROG}'")
+set(ENV{PATH} "${ENV_PATH}")

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

Summary of changes:
 Tests/RunCMake/find_program/A/{test => testAandB}  |    0
 Tests/RunCMake/find_program/B/{test => testAandB}  |    0
 Tests/RunCMake/find_program/EnvAndHints-stdout.txt |    2 +-
 Tests/RunCMake/find_program/EnvAndHints.cmake      |    4 +++-
 4 files changed, 4 insertions(+), 2 deletions(-)
 rename Tests/RunCMake/find_program/A/{test => testAandB} (100%)
 rename Tests/RunCMake/find_program/B/{test => testAandB} (100%)


hooks/post-receive
-- 
CMake