diff options
| author | Brad King <brad.king@kitware.com> | 2015-11-02 14:09:46 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-11-02 14:09:46 (GMT) |
| commit | b7b3b675fdb3240d8157b51d28bfe9b135d89302 (patch) | |
| tree | 1dda33bc8c4ec9211c79f9660eddb8226831b93b /Tests/RunCMake/find_program | |
| parent | 96ac964d765108ea0bf2c37567efdf777a6047e4 (diff) | |
| parent | 31e6571cca3267cf1f5e17df7c985521211885ef (diff) | |
| download | CMake-b7b3b675fdb3240d8157b51d28bfe9b135d89302.zip CMake-b7b3b675fdb3240d8157b51d28bfe9b135d89302.tar.gz CMake-b7b3b675fdb3240d8157b51d28bfe9b135d89302.tar.bz2 | |
Merge topic 'fix-find_program-regression'
31e6571c find_program: Fix regression in finding an already-known path
Diffstat (limited to 'Tests/RunCMake/find_program')
4 files changed, 14 insertions, 0 deletions
diff --git a/Tests/RunCMake/find_program/DirsPerName-stdout.txt b/Tests/RunCMake/find_program/DirsPerName-stdout.txt index f763bb0..dc1c82b 100644 --- a/Tests/RunCMake/find_program/DirsPerName-stdout.txt +++ b/Tests/RunCMake/find_program/DirsPerName-stdout.txt @@ -1 +1,2 @@ -- PROG='[^']*/Tests/RunCMake/find_program/B/testB' +-- PROG_ABS='[^']*/Tests/RunCMake/find_program/A/testA' diff --git a/Tests/RunCMake/find_program/DirsPerName.cmake b/Tests/RunCMake/find_program/DirsPerName.cmake index 54db6dd..6db778d 100644 --- a/Tests/RunCMake/find_program/DirsPerName.cmake +++ b/Tests/RunCMake/find_program/DirsPerName.cmake @@ -4,3 +4,9 @@ find_program(PROG NO_DEFAULT_PATH ) message(STATUS "PROG='${PROG}'") + +find_program(PROG_ABS + NAMES ${CMAKE_CURRENT_SOURCE_DIR}/A/testA + NO_DEFAULT_PATH + ) +message(STATUS "PROG_ABS='${PROG_ABS}'") diff --git a/Tests/RunCMake/find_program/NamesPerDir-stdout.txt b/Tests/RunCMake/find_program/NamesPerDir-stdout.txt index 964e259..fd79185 100644 --- a/Tests/RunCMake/find_program/NamesPerDir-stdout.txt +++ b/Tests/RunCMake/find_program/NamesPerDir-stdout.txt @@ -1 +1,2 @@ -- PROG='[^']*/Tests/RunCMake/find_program/A/testA' +-- PROG_ABS='[^']*/Tests/RunCMake/find_program/A/testA' diff --git a/Tests/RunCMake/find_program/NamesPerDir.cmake b/Tests/RunCMake/find_program/NamesPerDir.cmake index 49ce49d..5f00a28 100644 --- a/Tests/RunCMake/find_program/NamesPerDir.cmake +++ b/Tests/RunCMake/find_program/NamesPerDir.cmake @@ -4,3 +4,9 @@ find_program(PROG NO_DEFAULT_PATH ) message(STATUS "PROG='${PROG}'") + +find_program(PROG_ABS + NAMES ${CMAKE_CURRENT_SOURCE_DIR}/A/testA NAMES_PER_DIR + NO_DEFAULT_PATH + ) +message(STATUS "PROG_ABS='${PROG_ABS}'") |