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

BUG#682: Adding environment variable check to FIND_PACKAGE command.

Browse Source
This commit is contained in:
Brad King 2004-04-26 11:00:41 -04:00
parent b6f7e08242
commit 7c0844d2f4
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/FindITK.cmake
View File

@ -45,6 +45,9 @@ IF(NOT ITK_DIR)
# Look for an installation or build tree. # Look for an installation or build tree.
# #
FIND_PATH(ITK_DIR ITKConfig.cmake FIND_PATH(ITK_DIR ITKConfig.cmake
# Look for an environment variable ITK_DIR.
$ENV{ITK_DIR}
# Look in places relative to the system executable search path. # Look in places relative to the system executable search path.
${ITK_DIR_SEARCH} ${ITK_DIR_SEARCH}

3
Modules/FindVTK.cmake
View File

@ -65,6 +65,9 @@ IF(NOT VTK_DIR)
# Support legacy cache files. # Support legacy cache files.
${VTK_DIR_SEARCH_LEGACY} ${VTK_DIR_SEARCH_LEGACY}
# Look for an environment variable VTK_DIR.
$ENV{VTK_DIR}
# Look in places relative to the system executable search path. # Look in places relative to the system executable search path.
${VTK_DIR_SEARCH} ${VTK_DIR_SEARCH}

14
Source/cmFindPackageCommand.cxx
View File

@ -326,6 +326,20 @@ bool cmFindPackageCommand::FindConfig()
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
std::string cmFindPackageCommand::SearchForConfig() const std::string cmFindPackageCommand::SearchForConfig() const
{ {
// Check the environment variable.
std::string env;
if(cmSystemTools::GetEnv(this->Variable.c_str(), env) && env.length() > 0)
{
cmSystemTools::ConvertToUnixSlashes(env);
std::string f = env;
f += "/";
f += this->Config;
if(cmSystemTools::FileExists(f.c_str()))
{
return env;
}
}
// Search the build directories. // Search the build directories.
for(std::vector<cmStdString>::const_iterator b = this->Builds.begin(); for(std::vector<cmStdString>::const_iterator b = this->Builds.begin();
b != this->Builds.end(); ++b) b != this->Builds.end(); ++b)