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

Merge topic 'clean-autogen' 

3bd59b60 QtAutogen: Use cmHasLiteral{Prefix,Suffix} where possible.
bf00f528 QtAutogen: Don't take a reference to temporary.
This commit is contained in:
Brad King 2014-11-25 10:18:23 -05:00 committed by CMake Topic Stage
parent a5531950cc 3bd59b6014
commit c8da86a094
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmQtAutoGenerators.cxx
View File

@ -1482,7 +1482,7 @@ void cmQtAutoGenerators::Init()
{ {
const std::string &path = *it; const std::string &path = *it;
this->MocIncludes.push_back("-I" + path); this->MocIncludes.push_back("-I" + path);
if (this->EndsWith(path, ".framework/Headers")) if (cmHasLiteralSuffix(path, ".framework/Headers"))
{ {
// Go up twice to get to the framework root // Go up twice to get to the framework root
std::vector<std::string> pathComponents; std::vector<std::string> pathComponents;
@ -1503,7 +1503,7 @@ void cmQtAutoGenerators::Init()
if (this->IncludeProjectDirsBefore) if (this->IncludeProjectDirsBefore)
{ {
const std::string &binDir = "-I" + this->ProjectBinaryDir; const std::string binDir = "-I" + this->ProjectBinaryDir;
const std::string srcDir = "-I" + this->ProjectSourceDir; const std::string srcDir = "-I" + this->ProjectSourceDir;
@ -1774,7 +1774,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename,
std::string basename = cmsys::SystemTools:: std::string basename = cmsys::SystemTools::
GetFilenameWithoutLastExtension(currentMoc); GetFilenameWithoutLastExtension(currentMoc);
const bool moc_style = this->StartsWith(basename, "moc_"); const bool moc_style = cmHasLiteralPrefix(basename, "moc_");
// If the moc include is of the moc_foo.cpp style we expect // If the moc include is of the moc_foo.cpp style we expect
// the Q_OBJECT class declaration in a header file. // the Q_OBJECT class declaration in a header file.
@ -1956,7 +1956,7 @@ void cmQtAutoGenerators::StrictParseCppFile(const std::string& absFilename,
std::string basename = cmsys::SystemTools:: std::string basename = cmsys::SystemTools::
GetFilenameWithoutLastExtension(currentMoc); GetFilenameWithoutLastExtension(currentMoc);
const bool mocUnderscoreStyle = this->StartsWith(basename, "moc_"); const bool mocUnderscoreStyle = cmHasLiteralPrefix(basename, "moc_");
// If the moc include is of the moc_foo.cpp style we expect // If the moc include is of the moc_foo.cpp style we expect
// the Q_OBJECT class declaration in a header file. // the Q_OBJECT class declaration in a header file.