mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

ENH: make sure -F is not duplicated

Browse Source
This commit is contained in:
Bill Hoffman
2005-12-27 15:33:47 -05:00
parent 82bb6fae0d
commit 552842d11f
3 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmFindFileCommand.cxx
View File

@@ -70,6 +70,8 @@ bool cmFindFileCommand::InitialPass(std::vector<std::string> const& argsIn)
cmSystemTools::GlobDirs(args[j].c_str(), path);
}
cmSystemTools::GetPath(path, "CMAKE_LIBRARY_PATH");
// add the standard path
cmSystemTools::GetPath(path);
for(unsigned int k=0; k < path.size(); k++)
@@ -88,7 +90,7 @@ bool cmFindFileCommand::InitialPass(std::vector<std::string> const& argsIn)
}
}
#if defined (__APPLE__)
cmStdString fpath = this->FindHeaderInFrameworks(args[0].c_str(), args[1].c_str());
cmStdString fpath = this->FindHeaderInFrameworks(path, args[0].c_str(), args[1].c_str());
if(fpath.size())
{
m_Makefile->AddCacheDefinition(args[0].c_str(),
@@ -106,8 +108,10 @@ bool cmFindFileCommand::InitialPass(std::vector<std::string> const& argsIn)
return true;
}
cmStdString cmFindFileCommand::FindHeaderInFrameworks(const char* defineVar,
const char* file)
cmStdString cmFindFileCommand::FindHeaderInFrameworks(
std::vector<std::string> path,
const char* defineVar,
const char* file)
{
#ifndef __APPLE__
return cmStdString("");
@@ -130,12 +134,11 @@ cmStdString cmFindFileCommand::FindHeaderInFrameworks(const char* defineVar,
frameWorkName = "";
}
}
std::vector<cmStdString> path;
path.push_back("~/Library/Frameworks");
path.push_back("/Library/Frameworks");
path.push_back("/System/Library/Frameworks");
path.push_back("/Network/Library/Frameworks");
for( std::vector<cmStdString>::iterator i = path.begin();
for( std::vector<std::string>::iterator i = path.begin();
i != path.end(); ++i)
{
if(frameWorkName.size())