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

ENH: add .txx files and put the start directory in the search path

This commit is contained in:
Bill Hoffman 2005-10-18 16:10:04 -04:00
parent f72deca3a2
commit eef7ccc9d6
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Source/cmOutputRequiredFilesCommand.cxx
View File

@ -27,6 +27,7 @@ class cmLBDepend : public cmMakeDepend
void cmLBDepend::DependWalk(cmDependInformation* info) void cmLBDepend::DependWalk(cmDependInformation* info)
{ {
m_Verbose = true;
std::ifstream fin(info->m_FullPath.c_str()); std::ifstream fin(info->m_FullPath.c_str());
if(!fin) if(!fin)
{ {
@ -146,6 +147,26 @@ void cmLBDepend::DependWalk(cmDependInformation* info)
} }
} }
} }
if (!found)
{
cxxFile = root + ".txx";
if(cmSystemTools::FileExists(cxxFile.c_str()))
{
found = true;
}
for(std::vector<std::string>::iterator i =
m_IncludeDirectories.begin();
i != m_IncludeDirectories.end(); ++i)
{
std::string path = *i;
path = path + "/";
path = path + cxxFile;
if(cmSystemTools::FileExists(path.c_str()))
{
found = true;
}
}
}
if (found) if (found)
{ {
this->AddDependency(info, cxxFile.c_str()); this->AddDependency(info, cxxFile.c_str());
@ -178,7 +199,6 @@ ListDependencies(cmDependInformation const *info,
{ {
// add info to the visited set // add info to the visited set
visited->insert(info); visited->insert(info);
// now recurse with info's dependencies // now recurse with info's dependencies
for(cmDependInformation::DependencySet::const_iterator d = for(cmDependInformation::DependencySet::const_iterator d =
info->m_DependencySet.begin(); info->m_DependencySet.begin();
@ -190,7 +210,7 @@ ListDependencies(cmDependInformation const *info,
{ {
std::string tmp = (*d)->m_FullPath; std::string tmp = (*d)->m_FullPath;
std::string::size_type pos = tmp.rfind('.'); std::string::size_type pos = tmp.rfind('.');
if(pos != std::string::npos && tmp.substr(pos) == ".cxx") if(pos != std::string::npos && (tmp.substr(pos) != ".h"))
{ {
tmp = tmp.substr(0, pos); tmp = tmp.substr(0, pos);
fprintf(fout,"%s\n",(*d)->m_FullPath.c_str()); fprintf(fout,"%s\n",(*d)->m_FullPath.c_str());
@ -213,7 +233,7 @@ void cmOutputRequiredFilesCommand::FinalPass()
// compute the list of files // compute the list of files
cmLBDepend md; cmLBDepend md;
md.SetMakefile(m_Makefile); md.SetMakefile(m_Makefile);
md.AddSearchPath(m_Makefile->GetStartDirectory());
// find the depends for a file // find the depends for a file
const cmDependInformation *info = md.FindDependencies(m_File.c_str()); const cmDependInformation *info = md.FindDependencies(m_File.c_str());
if (info) if (info)