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

now includes current include files directory when searching for files it includes

Browse Source
This commit is contained in:
Ken Martin 2002-06-10 14:19:09 -04:00
parent 781fac21f0
commit fd26d44f5f
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Source/cmMakeDepend.cxx
View File

@ -80,7 +80,7 @@ void cmMakeDepend::SetMakefile(const cmMakefile* makefile)
const cmDependInformation* cmMakeDepend::FindDependencies(const char* file) const cmDependInformation* cmMakeDepend::FindDependencies(const char* file)
{ {
cmDependInformation* info = this->GetDependInformation(file); cmDependInformation* info = this->GetDependInformation(file,NULL);
this->GenerateDependInformation(info); this->GenerateDependInformation(info);
return info; return info;
} }
@ -235,15 +235,20 @@ void cmMakeDepend::DependWalk(cmDependInformation* info)
void cmMakeDepend::AddDependency(cmDependInformation* info, const char* file) void cmMakeDepend::AddDependency(cmDependInformation* info, const char* file)
{ {
cmDependInformation* dependInfo = this->GetDependInformation(file); cmDependInformation* dependInfo =
this->GetDependInformation(file,
cmSystemTools::GetFilenamePath(
cmSystemTools::CollapseFullPath(
info->m_FullPath.c_str())).c_str());
this->GenerateDependInformation(dependInfo); this->GenerateDependInformation(dependInfo);
info->AddDependencies(dependInfo); info->AddDependencies(dependInfo);
} }
cmDependInformation* cmMakeDepend::GetDependInformation(const char* file) cmDependInformation* cmMakeDepend::GetDependInformation(const char* file,
const char *extraPath)
{ {
// Get the full path for the file so that lookup is unambiguous. // Get the full path for the file so that lookup is unambiguous.
std::string fullPath = this->FullPath(file); std::string fullPath = this->FullPath(file, extraPath);
// Try to find the file's instance of cmDependInformation. // Try to find the file's instance of cmDependInformation.
DependInformationMap::const_iterator result = DependInformationMap::const_iterator result =
@ -279,7 +284,7 @@ void cmMakeDepend::GenerateMakefileDependencies()
if(!(*i)->GetIsAHeaderFileOnly()) if(!(*i)->GetIsAHeaderFileOnly())
{ {
cmDependInformation* info = cmDependInformation* info =
this->GetDependInformation((*i)->GetFullPath().c_str()); this->GetDependInformation((*i)->GetFullPath().c_str(),NULL);
this->AddFileToSearchPath(info->m_FullPath.c_str()); this->AddFileToSearchPath(info->m_FullPath.c_str());
info->m_cmSourceFile = *i; info->m_cmSourceFile = *i;
this->GenerateDependInformation(info); this->GenerateDependInformation(info);
@ -290,11 +295,11 @@ void cmMakeDepend::GenerateMakefileDependencies()
// find the full path to fname by searching the m_IncludeDirectories array // find the full path to fname by searching the m_IncludeDirectories array
std::string cmMakeDepend::FullPath(const char* fname) std::string cmMakeDepend::FullPath(const char* fname, const char *extraPath)
{ {
if(cmSystemTools::FileExists(fname)) if(cmSystemTools::FileExists(fname))
{ {
return std::string(fname); return std::string(cmSystemTools::CollapseFullPath(fname));
} }
for(std::vector<std::string>::iterator i = m_IncludeDirectories.begin(); for(std::vector<std::string>::iterator i = m_IncludeDirectories.begin();
@ -305,10 +310,21 @@ std::string cmMakeDepend::FullPath(const char* fname)
path = path + fname; path = path + fname;
if(cmSystemTools::FileExists(path.c_str())) if(cmSystemTools::FileExists(path.c_str()))
{ {
return path; return cmSystemTools::CollapseFullPath(path.c_str());
} }
} }
if (extraPath)
{
std::string path = extraPath;
path = path + "/";
path = path + fname;
if(cmSystemTools::FileExists(path.c_str()))
{
return cmSystemTools::CollapseFullPath(path.c_str());
}
}
// Couldn't find the file. // Couldn't find the file.
return std::string(fname); return std::string(fname);
} }

4
Source/cmMakeDepend.h
View File

@ -139,14 +139,14 @@ protected:
* Get an instance of cmDependInformation corresponding to the given file * Get an instance of cmDependInformation corresponding to the given file
* name. * name.
*/ */
cmDependInformation* GetDependInformation(const char* file); cmDependInformation* GetDependInformation(const char* file, const char *extraPath);
/** /**
* Find the full path name for the given file name. * Find the full path name for the given file name.
* This uses the include directories. * This uses the include directories.
* TODO: Cache path conversions to reduce FileExists calls. * TODO: Cache path conversions to reduce FileExists calls.
*/ */
std::string FullPath(const char*); std::string FullPath(const char *filename, const char *extraPath);
const cmMakefile* m_Makefile; const cmMakefile* m_Makefile;
bool m_Verbose; bool m_Verbose;