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 ef34192b04d49f21d39ecb9ceebfd5d95ec35bc2 (commit)
via 1b87abf73a6a1ac97cfc79f92baba28ee536e489 (commit)
from 37278dc705eb7cdb395a0d7b970cc4d82d2bf118 (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=ef34192b04d49f21d39ecb9ceebfd5d95ec35bc2
commit ef34192b04d49f21d39ecb9ceebfd5d95ec35bc2
Merge: 37278dc 1b87abf
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Sep 14 14:41:20 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Sep 14 14:41:20 2015 -0400
Merge topic 'fix-bad-search-ordering' into next
1b87abf7 fixup! find_*: Fix search order when the environment duplicates
some HINTS
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b87abf73a6a1ac97cfc79f92baba28ee536e489
commit 1b87abf73a6a1ac97cfc79f92baba28ee536e489
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Sep 14 14:40:46 2015 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Sep 14 14:40:49 2015 -0400
fixup! find_*: Fix search order when the environment duplicates some HINTS
Add a test case.
diff --git a/Tests/RunCMake/find_program/A/test
b/Tests/RunCMake/find_program/A/test
new file mode 100755
index 0000000..1a24852
--- /dev/null
+++ b/Tests/RunCMake/find_program/A/test
@@ -0,0 +1 @@
+#!/bin/sh
diff --git a/Tests/RunCMake/find_program/B/test
b/Tests/RunCMake/find_program/B/test
new file mode 100755
index 0000000..1a24852
--- /dev/null
+++ b/Tests/RunCMake/find_program/B/test
@@ -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..113263e
--- /dev/null
+++ b/Tests/RunCMake/find_program/EnvAndHints-stdout.txt
@@ -0,0 +1 @@
+-- PROG='[^']*/Tests/RunCMake/find_program/A/test'
diff --git a/Tests/RunCMake/find_program/EnvAndHints.cmake
b/Tests/RunCMake/find_program/EnvAndHints.cmake
new file mode 100644
index 0000000..3e30157
--- /dev/null
+++ b/Tests/RunCMake/find_program/EnvAndHints.cmake
@@ -0,0 +1,6 @@
+set(ENV{PATH} ${CMAKE_CURRENT_SOURCE_DIR}/A)
+find_program(PROG
+ NAMES test
+ HINTS ${CMAKE_CURRENT_SOURCE_DIR}/A ${CMAKE_CURRENT_SOURCE_DIR}/B
+ )
+message(STATUS "PROG='${PROG}'")
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)
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/find_program/A/{testA => test} | 0
Tests/RunCMake/find_program/{A/testA => B/test} | 0
Tests/RunCMake/find_program/EnvAndHints-stdout.txt | 1 +
Tests/RunCMake/find_program/EnvAndHints.cmake | 6 ++++++
Tests/RunCMake/find_program/RunCMakeTest.cmake | 1 +
5 files changed, 8 insertions(+)
copy Tests/RunCMake/find_program/A/{testA => test} (100%)
copy Tests/RunCMake/find_program/{A/testA => B/test} (100%)
create mode 100644 Tests/RunCMake/find_program/EnvAndHints-stdout.txt
create mode 100644 Tests/RunCMake/find_program/EnvAndHints.cmake
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
