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

QtAutogen: Allow multiple moc files with the same name 

Use cmFilePathUuid for moc files.

Closes: #12873
This commit is contained in:
Sebastian Holtermann 2016-08-06 13:33:46 +02:00 committed by Brad King
parent 3c3b37b0bb
commit 41c9e14afb
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/cmQtAutoGenerators.cxx
View File

@ -14,6 +14,7 @@
#include "cmQtAutoGenerators.h" #include "cmQtAutoGenerators.h"
#include "cmAlgorithms.h" #include "cmAlgorithms.h"
#include "cmFilePathUuid.h"
#include "cmGlobalGenerator.h" #include "cmGlobalGenerator.h"
#include "cmMakefile.h" #include "cmMakefile.h"
#include "cmOutputConverter.h" #include "cmOutputConverter.h"
@ -358,11 +359,13 @@ void cmQtAutoGenerators::WriteOldMocDefinitionsFile(
void cmQtAutoGenerators::Init() void cmQtAutoGenerators::Init()
{ {
this->TargetBuildSubDir = this->TargetName;
this->TargetBuildSubDir += ".dir/";
this->OutMocCppFilenameRel = this->TargetName; this->OutMocCppFilenameRel = this->TargetName;
this->OutMocCppFilenameRel += ".cpp"; this->OutMocCppFilenameRel += ".cpp";
this->OutMocCppFilename = this->Builddir; this->OutMocCppFilenameAbs = this->Builddir + this->OutMocCppFilenameRel;
this->OutMocCppFilename += this->OutMocCppFilenameRel;
std::vector<std::string> cdefList; std::vector<std::string> cdefList;
cmSystemTools::ExpandListArgument(this->MocCompileDefinitionsStr, cdefList); cmSystemTools::ExpandListArgument(this->MocCompileDefinitionsStr, cdefList);
@ -439,7 +442,7 @@ static std::string ReadAll(const std::string& filename)
bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile) bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
{ {
if (!cmsys::SystemTools::FileExists(this->OutMocCppFilename.c_str()) || if (!cmsys::SystemTools::FileExists(this->OutMocCppFilenameAbs.c_str()) ||
(this->OldCompileSettingsStr != this->CurrentCompileSettingsStr)) { (this->OldCompileSettingsStr != this->CurrentCompileSettingsStr)) {
this->GenerateAll = true; this->GenerateAll = true;
} }
@ -933,6 +936,8 @@ void cmQtAutoGenerators::ParseHeaders(
std::map<std::string, std::string>& notIncludedMocs, std::map<std::string, std::string>& notIncludedMocs,
std::map<std::string, std::vector<std::string> >& includedUis) std::map<std::string, std::vector<std::string> >& includedUis)
{ {
cmFilePathUuid fpathUuid(this->Srcdir, this->Builddir,
this->ProjectSourceDir, this->ProjectBinaryDir);
for (std::set<std::string>::const_iterator hIt = absHeaders.begin(); for (std::set<std::string>::const_iterator hIt = absHeaders.begin();
hIt != absHeaders.end(); ++hIt) { hIt != absHeaders.end(); ++hIt) {
const std::string& headerName = *hIt; const std::string& headerName = *hIt;
@ -946,13 +951,10 @@ void cmQtAutoGenerators::ParseHeaders(
this->LogInfo(err.str()); this->LogInfo(err.str());
} }
const std::string basename =
cmsys::SystemTools::GetFilenameWithoutLastExtension(headerName);
const std::string currentMoc = "moc_" + basename + ".cpp";
std::string macroName; std::string macroName;
if (requiresMocing(contents, macroName)) { if (requiresMocing(contents, macroName)) {
notIncludedMocs[headerName] = currentMoc; notIncludedMocs[headerName] =
this->TargetBuildSubDir + fpathUuid.get(headerName, "moc_", ".cpp");
} }
} }
this->ParseForUic(headerName, contents, includedUis); this->ParseForUic(headerName, contents, includedUis);
@ -1029,7 +1031,7 @@ bool cmQtAutoGenerators::GenerateMocFiles(
// check if we even need to update _automoc.cpp // check if we even need to update _automoc.cpp
if (!automocCppChanged) { if (!automocCppChanged) {
// compare contents of the _automoc.cpp file // compare contents of the _automoc.cpp file
const std::string oldContents = ReadAll(this->OutMocCppFilename); const std::string oldContents = ReadAll(this->OutMocCppFilenameAbs);
if (oldContents == automocSource) { if (oldContents == automocSource) {
// nothing changed: don't touch the _automoc.cpp file // nothing changed: don't touch the _automoc.cpp file
if (this->Verbose) { if (this->Verbose) {
@ -1052,7 +1054,7 @@ bool cmQtAutoGenerators::GenerateMocFiles(
} }
{ {
cmsys::ofstream outfile; cmsys::ofstream outfile;
outfile.open(this->OutMocCppFilename.c_str(), std::ios::trunc); outfile.open(this->OutMocCppFilenameAbs.c_str(), std::ios::trunc);
outfile << automocSource; outfile << automocSource;
outfile.close(); outfile.close();
} }

3
Source/cmQtAutoGenerators.h
View File

@ -123,8 +123,9 @@ private:
std::string CurrentCompileSettingsStr; std::string CurrentCompileSettingsStr;
std::string OldCompileSettingsStr; std::string OldCompileSettingsStr;
std::string TargetBuildSubDir;
std::string OutMocCppFilenameRel; std::string OutMocCppFilenameRel;
std::string OutMocCppFilename; std::string OutMocCppFilenameAbs;
std::list<std::string> MocIncludes; std::list<std::string> MocIncludes;
std::list<std::string> MocDefinitions; std::list<std::string> MocDefinitions;
std::vector<std::string> MocOptions; std::vector<std::string> MocOptions;