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

BUG: Handle header file dependencies for objective C

Browse Source
This commit is contained in:
Andy Cedilnik 2006-09-26 08:04:23 -04:00
parent 2912432cbc
commit e10f739571
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmDependsC.cxx
View File

@ -33,7 +33,7 @@ cmDependsC::cmDependsC(std::vector<std::string> const& includes,
const char* scanRegex, const char* complainRegex, const char* scanRegex, const char* complainRegex,
const cmStdString& cacheFileName): const cmStdString& cacheFileName):
IncludePath(&includes), IncludePath(&includes),
IncludeRegexLine("^[ \t]*#[ \t]*include[ \t]*[<\"]([^\">]+)([\">])"), IncludeRegexLine("^[ \t]*#[ \t]*(include|import)[ \t]*[<\"]([^\">]+)([\">])"),
IncludeRegexScan(scanRegex), IncludeRegexScan(scanRegex),
IncludeRegexComplain(complainRegex), IncludeRegexComplain(complainRegex),
CacheFileName(cacheFileName) CacheFileName(cacheFileName)
@ -354,8 +354,8 @@ void cmDependsC::Scan(std::istream& is, const char* directory,
{ {
// Get the file being included. // Get the file being included.
UnscannedEntry entry; UnscannedEntry entry;
entry.FileName = this->IncludeRegexLine.match(1); entry.FileName = this->IncludeRegexLine.match(2);
if(this->IncludeRegexLine.match(2) == "\"" && if(this->IncludeRegexLine.match(3) == "\"" &&
!cmSystemTools::FileIsFullPath(entry.FileName.c_str())) !cmSystemTools::FileIsFullPath(entry.FileName.c_str()))
{ {
// This was a double-quoted include with a relative path. We // This was a double-quoted include with a relative path. We