[Cmake-commits] CMake branch, next, updated. v3.3.1-2942-gda4f811

[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  da4f811fb4c193553595f2aa1bc925b48677b6ef (commit)
       via  7a6e5f06e7a32c894313b3a07c3d3c9abad8d2ca (commit)
       via  401229759c2a738b085b3337babdded645415664 (commit)
      from  ad0aec244b522a1e5d7cf36227bd476524f80d8e (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=da4f811fb4c193553595f2aa1bc925b48677b6ef
commit da4f811fb4c193553595f2aa1bc925b48677b6ef
Merge: ad0aec2 7a6e5f0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 15 08:54:20 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 15 08:54:20 2015 -0400

    Merge topic 'test-search-ordering' into next
    
    7a6e5f06 Tests: Cover find_program when the environment duplicate some HINTS
    40122975 Merge branch 'fix-bad-search-ordering' into test-search-ordering


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a6e5f06e7a32c894313b3a07c3d3c9abad8d2ca
commit 7a6e5f06e7a32c894313b3a07c3d3c9abad8d2ca
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 14 14:49:49 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 15 08:53:06 2015 -0400

    Tests: Cover find_program when the environment duplicate some HINTS
    
    Reported-by: Marc CHEVRIER <marc.chevrier at sap.com>

diff --git a/Tests/RunCMake/find_program/A/testAandB b/Tests/RunCMake/find_program/A/testAandB
new file mode 100755
index 0000000..1a24852
--- /dev/null
+++ b/Tests/RunCMake/find_program/A/testAandB
@@ -0,0 +1 @@
+#!/bin/sh
diff --git a/Tests/RunCMake/find_program/B/testAandB b/Tests/RunCMake/find_program/B/testAandB
new file mode 100755
index 0000000..1a24852
--- /dev/null
+++ b/Tests/RunCMake/find_program/B/testAandB
@@ -0,0 +1 @@
+#!/bin/sh
diff --git a/Tests/RunCMake/find_program/EnvAndHints-stdout.txt b/Tests/RunCMake/find_program/EnvAndHints-stdout.txt
new file mode 100644
index 0000000..39329b2
--- /dev/null
+++ b/Tests/RunCMake/find_program/EnvAndHints-stdout.txt
@@ -0,0 +1 @@
+-- PROG='[^']*/Tests/RunCMake/find_program/A/testAandB'
diff --git a/Tests/RunCMake/find_program/EnvAndHints.cmake b/Tests/RunCMake/find_program/EnvAndHints.cmake
new file mode 100644
index 0000000..14ebd6e
--- /dev/null
+++ b/Tests/RunCMake/find_program/EnvAndHints.cmake
@@ -0,0 +1,8 @@
+set(ENV_PATH "$ENV{PATH}")
+set(ENV{PATH} ${CMAKE_CURRENT_SOURCE_DIR}/A)
+find_program(PROG
+  NAMES testAandB
+  HINTS ${CMAKE_CURRENT_SOURCE_DIR}/A ${CMAKE_CURRENT_SOURCE_DIR}/B
+  )
+message(STATUS "PROG='${PROG}'")
+set(ENV{PATH} "${ENV_PATH}")
diff --git a/Tests/RunCMake/find_program/RunCMakeTest.cmake b/Tests/RunCMake/find_program/RunCMakeTest.cmake
index 2adec11..89307c1 100644
--- a/Tests/RunCMake/find_program/RunCMakeTest.cmake
+++ b/Tests/RunCMake/find_program/RunCMakeTest.cmake
@@ -1,5 +1,6 @@
 include(RunCMake)
 
+run_cmake(EnvAndHints)
 run_cmake(DirsPerName)
 run_cmake(NamesPerDir)
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=401229759c2a738b085b3337babdded645415664
commit 401229759c2a738b085b3337babdded645415664
Merge: 0e7f34c 0244015
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 14 14:49:37 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 15 08:52:38 2015 -0400

    Merge branch 'fix-bad-search-ordering' into test-search-ordering


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

Summary of changes:


hooks/post-receive
-- 
CMake