reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-12-14 15:19:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

find_program: Fix regression in finding an already-known path

Browse Source 
Changes in commit v3.4.0-rc1~124^2~1 (cmFindProgramCommand: Re-implement
search using more flexible approach, 2015-09-01) did not preserve the
behavior of looking for the given name with no search path at all.
Fix this and add a test case covering finding an absolute path with
no search directories.
This commit is contained in:
Brad King 2015-10-29 17:50:19 -04:00
parent 8ea7611bc3
commit 31e6571cca
5 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmFindProgramCommand.cxx
View File

@ -176,6 +176,13 @@ std::string cmFindProgramCommand::FindNormalProgramNamesPerDir()
{ {
helper.AddName(*ni); helper.AddName(*ni);
} }
// Check for the names themselves (e.g. absolute paths).
if (helper.CheckDirectory(std::string()))
{
return helper.BestPath;
}
// Search every directory. // Search every directory.
for (std::vector<std::string>::const_iterator for (std::vector<std::string>::const_iterator
p = this->SearchPaths.begin(); p != this->SearchPaths.end(); ++p) p = this->SearchPaths.begin(); p != this->SearchPaths.end(); ++p)
@ -200,6 +207,12 @@ std::string cmFindProgramCommand::FindNormalProgramDirsPerName()
// Switch to searching for this name. // Switch to searching for this name.
helper.SetName(*ni); helper.SetName(*ni);
// Check for the name by itself (e.g. an absolute path).
if (helper.CheckDirectory(std::string()))
{
return helper.BestPath;
}
// Search every directory. // Search every directory.
for (std::vector<std::string>::const_iterator for (std::vector<std::string>::const_iterator
p = this->SearchPaths.begin(); p = this->SearchPaths.begin();

1
Tests/RunCMake/find_program/DirsPerName-stdout.txt
View File

@ -1 +1,2 @@
-- PROG='[^']*/Tests/RunCMake/find_program/B/testB' -- PROG='[^']*/Tests/RunCMake/find_program/B/testB'
-- PROG_ABS='[^']*/Tests/RunCMake/find_program/A/testA'

6
Tests/RunCMake/find_program/DirsPerName.cmake
View File

@ -4,3 +4,9 @@ find_program(PROG
NO_DEFAULT_PATH NO_DEFAULT_PATH
) )
message(STATUS "PROG='${PROG}'") message(STATUS "PROG='${PROG}'")
find_program(PROG_ABS
NAMES ${CMAKE_CURRENT_SOURCE_DIR}/A/testA
NO_DEFAULT_PATH
)
message(STATUS "PROG_ABS='${PROG_ABS}'")

1
Tests/RunCMake/find_program/NamesPerDir-stdout.txt
View File

@ -1 +1,2 @@
-- PROG='[^']*/Tests/RunCMake/find_program/A/testA' -- PROG='[^']*/Tests/RunCMake/find_program/A/testA'
-- PROG_ABS='[^']*/Tests/RunCMake/find_program/A/testA'

6
Tests/RunCMake/find_program/NamesPerDir.cmake
View File

@ -4,3 +4,9 @@ find_program(PROG
NO_DEFAULT_PATH NO_DEFAULT_PATH
) )
message(STATUS "PROG='${PROG}'") 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}'")