summaryrefslogtreecommitdiffstats
path: root/Source/cmDependsC.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2005-03-03 20:22:18 (GMT)
committerBrad King <brad.king@kitware.com>2005-03-03 20:22:18 (GMT)
commit2fe4e650bf4921f049d6d2cf7cc8a2a7486d1913 (patch)
tree3029127872a9b4fd22d08fcbe27137002ba77af9 /Source/cmDependsC.h
parent5290b40c471ff28a976fdb4d0c6a3315630cbd16 (diff)
downloadCMake-2fe4e650bf4921f049d6d2cf7cc8a2a7486d1913.zip
CMake-2fe4e650bf4921f049d6d2cf7cc8a2a7486d1913.tar.gz
CMake-2fe4e650bf4921f049d6d2cf7cc8a2a7486d1913.tar.bz2
BUG: Fixed scanning to account for double-quote includes.
Diffstat (limited to 'Source/cmDependsC.h')
-rw-r--r--Source/cmDependsC.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/cmDependsC.h b/Source/cmDependsC.h
index 936997f..229c7e9 100644
--- a/Source/cmDependsC.h
+++ b/Source/cmDependsC.h
@@ -48,7 +48,7 @@ protected:
virtual bool CheckDependencies(std::istream& is);
// Method to scan a single file.
- void Scan(std::istream& is);
+ void Scan(std::istream& is, const char* directory);
// The source file from which to start scanning.
std::string m_SourceFile;
@@ -65,8 +65,13 @@ protected:
cmsys::RegularExpression m_IncludeRegexComplain;
// Data structures for dependency graph walk.
+ struct UnscannedEntry
+ {
+ cmStdString FileName;
+ cmStdString QuotedLocation;
+ };
std::set<cmStdString> m_Encountered;
- std::queue<cmStdString> m_Unscanned;
+ std::queue<UnscannedEntry> m_Unscanned;
private:
cmDependsC(cmDependsC const&); // Purposely not implemented.