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

BUG: Fix for scanning generated headers included with double-quotes. Also fixed double-quote include support to not use the special quoted location when a full path is given on the include line.

Browse Source
This commit is contained in:
Brad King 2006-01-05 17:16:22 -05:00
parent bdbb7f84bc
commit 8dc1de6efd
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Source/cmDependsC.cxx
View File

@ -318,10 +318,12 @@ void cmDependsC::Scan(std::istream& is, const char* directory, const cmStdString
// Get the file being included. // Get the file being included.
UnscannedEntry entry; UnscannedEntry entry;
entry.FileName = m_IncludeRegexLine.match(1); entry.FileName = m_IncludeRegexLine.match(1);
if(m_IncludeRegexLine.match(2) == "\"") if(m_IncludeRegexLine.match(2) == "\"" &&
!cmSystemTools::FileIsFullPath(entry.FileName.c_str()))
{ {
// This was a double-quoted include. We must check for the // This was a double-quoted include with a relative path. We
// file in the directory containing the file we are scanning. // must check for the file in the directory containing the
// file we are scanning.
entry.QuotedLocation = directory; entry.QuotedLocation = directory;
entry.QuotedLocation += "/"; entry.QuotedLocation += "/";
entry.QuotedLocation += entry.FileName; entry.QuotedLocation += entry.FileName;
@ -352,7 +354,32 @@ bool cmDependsC::FileExistsOrIsGenerated(const std::string& fname,
std::set<cmStdString>& scanned, std::set<cmStdString>& scanned,
std::set<cmStdString>& dependencies) std::set<cmStdString>& dependencies)
{ {
// Check first for a generated file. // Check for a generated file.
if(this->FileIsGenerated(fname, scanned, dependencies))
{
return true;
}
else if(cmSystemTools::FileIsFullPath(fname.c_str()))
{
// The generated file may have been listed with a relative path.
std::string dir = cmSystemTools::CollapseFullPath(m_Directory.c_str());
std::string rname =
cmSystemTools::RelativePath(dir.c_str(), fname.c_str());
if(this->FileIsGenerated(rname, scanned, dependencies))
{
return true;
}
}
// Check for an existing file.
return cmSystemTools::FileExists(fname.c_str());
}
//----------------------------------------------------------------------------
bool cmDependsC::FileIsGenerated(const std::string& fname,
std::set<cmStdString>& scanned,
std::set<cmStdString>& dependencies)
{
if(m_GeneratedFiles && if(m_GeneratedFiles &&
std::set<cmStdString>::const_iterator(m_GeneratedFiles->find(fname)) != std::set<cmStdString>::const_iterator(m_GeneratedFiles->find(fname)) !=
m_GeneratedFiles->end()) m_GeneratedFiles->end())
@ -369,6 +396,6 @@ bool cmDependsC::FileExistsOrIsGenerated(const std::string& fname,
} }
else else
{ {
return cmSystemTools::FileExists(fname.c_str()); return false;
} }
} }

3
Source/cmDependsC.h
View File

@ -53,6 +53,9 @@ protected:
bool FileExistsOrIsGenerated(const std::string& fname, bool FileExistsOrIsGenerated(const std::string& fname,
std::set<cmStdString>& scanned, std::set<cmStdString>& scanned,
std::set<cmStdString>& dependencies); std::set<cmStdString>& dependencies);
bool FileIsGenerated(const std::string& fname,
std::set<cmStdString>& scanned,
std::set<cmStdString>& dependencies);
// The include file search path. // The include file search path.
std::vector<std::string> const* m_IncludePath; std::vector<std::string> const* m_IncludePath;