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

automoc: move the code for finding headers into separate function 

Alex
This commit is contained in:
Alex Neundorf 2011-12-02 20:38:14 +01:00
parent 8507eaed16
commit 174bf35fbb
2 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Source/cmQtAutomoc.cxx
View File

@ -469,6 +469,23 @@ bool cmQtAutomoc::RunAutomocQt4()
std::vector<std::string> sourceFiles; std::vector<std::string> sourceFiles;
cmSystemTools::ExpandListArgument(this->Sources, sourceFiles); cmSystemTools::ExpandListArgument(this->Sources, sourceFiles);
std::list<std::string> headerExtensions;
headerExtensions.push_back(".h");
headerExtensions.push_back(".hpp");
headerExtensions.push_back(".hxx");
#if defined(_WIN32)
// not case sensitive, don't add ".H"
#elif defined(__APPLE__)
// detect case-sensitive filesystem
long caseSensitive = pathconf(this->Srcdir.c_str(), _PC_CASE_SENSITIVE);
if (caseSensitive == 1)
{
headerExtensions.push_back(".H");
}
#else
headerExtensions.push_back(".H");
#endif
for (std::vector<std::string>::const_iterator it = sourceFiles.begin(); for (std::vector<std::string>::const_iterator it = sourceFiles.begin();
it != sourceFiles.end(); it != sourceFiles.end();
++it) ++it)
@ -478,7 +495,8 @@ bool cmQtAutomoc::RunAutomocQt4()
{ {
std::cout << "AUTOMOC: Checking " << absFilename << std::endl; std::cout << "AUTOMOC: Checking " << absFilename << std::endl;
} }
this->ParseCppFile(absFilename, includedMocs, headerFiles); this->ParseCppFile(absFilename, headerExtensions, includedMocs);
this->SearchHeadersForCppFile(absFilename, headerExtensions, headerFiles);
} }
std::vector<std::string> headerFilesVec; std::vector<std::string> headerFilesVec;
@ -559,28 +577,12 @@ bool cmQtAutomoc::RunAutomocQt4()
void cmQtAutomoc::ParseCppFile(const std::string& absFilename, void cmQtAutomoc::ParseCppFile(const std::string& absFilename,
std::map<std::string, std::string>& includedMocs, const std::list<std::string>& headerExtensions,
std::set<std::string>& absHeaders) std::map<std::string, std::string>& includedMocs)
{ {
cmsys::RegularExpression mocIncludeRegExp( cmsys::RegularExpression mocIncludeRegExp(
"[\n][ \t]*#[ \t]*include[ \t]+" "[\n][ \t]*#[ \t]*include[ \t]+"
"[\"<](([^ \">]+/)?moc_[^ \">/]+\\.cpp|[^ \">]+\\.moc)[\">]"); "[\"<](([^ \">]+/)?moc_[^ \">/]+\\.cpp|[^ \">]+\\.moc)[\">]");
std::list<std::string> headerExtensions;
headerExtensions.push_back(".h");
headerExtensions.push_back(".hpp");
headerExtensions.push_back(".hxx");
#if defined(_WIN32)
// not case sensitive, don't add ".H"
#elif defined(__APPLE__)
// detect case-sensitive filesystem
long caseSensitive = pathconf(this->Srcdir.c_str(), _PC_CASE_SENSITIVE);
if (caseSensitive == 1)
{
headerExtensions.push_back(".H");
}
#else
headerExtensions.push_back(".H");
#endif
const std::string contentsString = this->ReadAll(absFilename); const std::string contentsString = this->ReadAll(absFilename);
if (contentsString.empty()) if (contentsString.empty())
@ -771,9 +773,19 @@ void cmQtAutomoc::ParseCppFile(const std::string& absFilename,
} }
} }
}
void cmQtAutomoc::SearchHeadersForCppFile(const std::string& absFilename,
const std::list<std::string>& headerExtensions,
std::set<std::string>& absHeaders)
{
// search for header files and private header files we may need to moc: // search for header files and private header files we may need to moc:
const std::string basename = const std::string basename =
cmsys::SystemTools::GetFilenameWithoutLastExtension(absFilename); cmsys::SystemTools::GetFilenameWithoutLastExtension(absFilename);
const std::string absPath = cmsys::SystemTools::GetFilenamePath(
cmsys::SystemTools::GetRealPath(absFilename.c_str())) + '/';
for(std::list<std::string>::const_iterator ext = headerExtensions.begin(); for(std::list<std::string>::const_iterator ext = headerExtensions.begin();
ext != headerExtensions.end(); ext != headerExtensions.end();
++ext) ++ext)

8
Source/cmQtAutomoc.h
View File

@ -39,8 +39,12 @@ private:
bool GenerateMoc(const std::string& sourceFile, bool GenerateMoc(const std::string& sourceFile,
const std::string& mocFileName); const std::string& mocFileName);
void ParseCppFile(const std::string& absFilename, void ParseCppFile(const std::string& absFilename,
std::map<std::string, std::string>& includedMocs, const std::list<std::string>& headerExtensions,
std::set<std::string>& absHeaders); std::map<std::string, std::string>& includedMocs);
void SearchHeadersForCppFile(const std::string& absFilename,
const std::list<std::string>& headerExtensions,
std::set<std::string>& absHeaders);
void ParseHeaders(const std::set<std::string>& absHeaders, void ParseHeaders(const std::set<std::string>& absHeaders,
const std::map<std::string, std::string>& includedMocs, const std::map<std::string, std::string>& includedMocs,
std::map<std::string, std::string>& notIncludedMocs); std::map<std::string, std::string>& notIncludedMocs);