diff options
| author | Brad King <brad.king@kitware.com> | 2015-09-16 12:47:25 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-09-16 12:47:25 (GMT) |
| commit | 982850a86698d41d6998b4d538c128949570efdf (patch) | |
| tree | 820b6fcf2c6e8bfeb67edb97cd331ed766bbc724 /Tests/RunCMake | |
| parent | 0ec62015471eee37cb99765578e0db8b2f633350 (diff) | |
| parent | 7a6e5f06e7a32c894313b3a07c3d3c9abad8d2ca (diff) | |
| download | CMake-982850a86698d41d6998b4d538c128949570efdf.zip CMake-982850a86698d41d6998b4d538c128949570efdf.tar.gz CMake-982850a86698d41d6998b4d538c128949570efdf.tar.bz2 | |
Merge topic 'test-search-ordering'
7a6e5f06 Tests: Cover find_program when the environment duplicate some HINTS
40122975 Merge branch 'fix-bad-search-ordering' into test-search-ordering
02440154 find_*: Fix search order when the environment duplicates some HINTS
Diffstat (limited to 'Tests/RunCMake')
| -rwxr-xr-x | Tests/RunCMake/find_program/A/testAandB | 1 | ||||
| -rwxr-xr-x | Tests/RunCMake/find_program/B/testAandB | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/find_program/EnvAndHints-stdout.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/find_program/EnvAndHints.cmake | 8 | ||||
| -rw-r--r-- | Tests/RunCMake/find_program/RunCMakeTest.cmake | 1 |
5 files changed, 12 insertions, 0 deletions
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) |