mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-05 05:39:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'automoc-src-per-dir'

Browse Source 
9beb2744 Automoc: Fix support of files with the same name (#12873)
This commit is contained in:
Brad King
2016-02-18 10:07:56 -05:00
committed by CMake Topic Stage
parent ede2a6ea6b 9beb2744d7
commit 135a0df525
6 changed files with 59 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmQtAutoGenerators.cxx
+32 -3
View File
@@ -1104,10 +1104,39 @@ void cmQtAutoGenerators::ParseHeaders(const std::set<std::string>& absHeaders,
std::cout << "AUTOGEN: Checking " << headerName << std::endl;
}
const std::string basename = cmsys::SystemTools::
GetFilenameWithoutLastExtension(headerName);
std::string headerDirectory;
if (cmsys::SystemTools::IsSubDirectory(headerName,
this->ProjectSourceDir))
{
headerDirectory = this->ProjectSourceDir;
}
else if (cmsys::SystemTools::IsSubDirectory(headerName,
this->ProjectBinaryDir))
{
headerDirectory = this->ProjectBinaryDir;
}
else
{
cmsys::SystemTools::SplitPathRootComponent(headerName,
&headerDirectory);
}
const std::string currentMoc = "moc_" + basename + ".cpp";
std::string baseHeaderName =
cmsys::SystemTools::GetFilenameWithoutLastExtension(headerName);
headerDirectory = cmsys::SystemTools::RelativePath(
headerDirectory, cmsys::SystemTools::GetParentDirectory(headerName));
if (!headerDirectory.empty())
{
headerDirectory += "/";
}
std::string mocName = headerDirectory + baseHeaderName;
cmSystemTools::ReplaceString(mocName, "/", "_");
const std::string currentMoc = "moc_" + mocName + ".cpp";
std::string macroName;
if (requiresMocing(contents, macroName))
{