kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'test-search-ordering'

Browse Source 
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
This commit is contained in:
Brad King 2015-09-16 08:47:25 -04:00 committed by CMake Topic Stage
commit 982850a866
7 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmFindBase.cxx
View File

@ -207,6 +207,10 @@ void cmFindBase::ExpandPaths()
{ {
this->FillCMakeEnvironmentPath(); this->FillCMakeEnvironmentPath();
} }
}
this->FillUserHintsPath();
if(!this->NoDefaultPath)
{
if(!this->NoSystemEnvironmentPath) if(!this->NoSystemEnvironmentPath)
{ {
this->FillSystemEnvironmentPath(); this->FillSystemEnvironmentPath();
@ -216,8 +220,6 @@ void cmFindBase::ExpandPaths()
this->FillCMakeSystemVariablePath(); this->FillCMakeSystemVariablePath();
} }
} }
this->FillUserHintsPath();
this->FillUserGuessPath(); this->FillUserGuessPath();
} }

5
Source/cmFindPackageCommand.cxx
View File

@ -1133,6 +1133,10 @@ void cmFindPackageCommand::ComputePrefixes()
{ {
this->FillPrefixesCMakeEnvironment(); this->FillPrefixesCMakeEnvironment();
} }
}
this->FillPrefixesUserHints();
if(!this->NoDefaultPath)
{
if(!this->NoSystemEnvironmentPath) if(!this->NoSystemEnvironmentPath)
{ {
this->FillPrefixesSystemEnvironment(); this->FillPrefixesSystemEnvironment();
@ -1150,7 +1154,6 @@ void cmFindPackageCommand::ComputePrefixes()
this->FillPrefixesSystemRegistry(); this->FillPrefixesSystemRegistry();
} }
} }
this->FillPrefixesUserHints();
this->FillPrefixesUserGuess(); this->FillPrefixesUserGuess();
this->ComputeFinalPaths(); this->ComputeFinalPaths();

1
Tests/RunCMake/find_program/A/testAandB Executable file
View File

@ -0,0 +1 @@
#!/bin/sh

1
Tests/RunCMake/find_program/B/testAandB Executable file
View File

@ -0,0 +1 @@
#!/bin/sh

1
Tests/RunCMake/find_program/EnvAndHints-stdout.txt Normal file
View File

@ -0,0 +1 @@
-- PROG='[^']*/Tests/RunCMake/find_program/A/testAandB'

8
Tests/RunCMake/find_program/EnvAndHints.cmake Normal file
View File

@ -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}")

1
Tests/RunCMake/find_program/RunCMakeTest.cmake
View File

@ -1,5 +1,6 @@
include(RunCMake) include(RunCMake)
run_cmake(EnvAndHints)
run_cmake(DirsPerName) run_cmake(DirsPerName)
run_cmake(NamesPerDir) run_cmake(NamesPerDir)