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

Add extra checks for the AUTOMOC target property. 

In an upcoming commit, this class will be used even if it is not set.
This commit is contained in:
Stephen Kelly 2013-10-11 13:30:54 +02:00
parent 32771fc7ca
commit 7ce65c3c97
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Source/cmQtAutoGenerators.cxx
View File

@ -149,18 +149,22 @@ bool cmQtAutoGenerators::InitializeMocSourceFile(cmTarget* target)
return false; return false;
} }
std::string automocTargetName = target->GetName(); if (target->GetPropertyAsBool("AUTOMOC"))
automocTargetName += "_automoc"; {
std::string mocCppFile = makefile->GetCurrentOutputDirectory(); std::string automocTargetName = target->GetName();
mocCppFile += "/"; automocTargetName += "_automoc";
mocCppFile += automocTargetName; std::string mocCppFile = makefile->GetCurrentOutputDirectory();
mocCppFile += ".cpp"; mocCppFile += "/";
cmSourceFile* mocCppSource = makefile->GetOrCreateSource(mocCppFile.c_str(), mocCppFile += automocTargetName;
true); mocCppFile += ".cpp";
makefile->AppendProperty("ADDITIONAL_MAKE_CLEAN_FILES", cmSourceFile* mocCppSource = makefile->GetOrCreateSource(
mocCppFile.c_str(), false); mocCppFile.c_str(),
true);
makefile->AppendProperty("ADDITIONAL_MAKE_CLEAN_FILES",
mocCppFile.c_str(), false);
target->AddSourceFile(mocCppSource); target->AddSourceFile(mocCppSource);
}
return true; return true;
} }
@ -313,8 +317,11 @@ void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget* target)
std::map<std::string, std::string> configIncludes; std::map<std::string, std::string> configIncludes;
std::map<std::string, std::string> configDefines; std::map<std::string, std::string> configDefines;
this->SetupAutoMocTarget(target, autogenTargetName, if (target->GetPropertyAsBool("AUTOMOC"))
configIncludes, configDefines); {
this->SetupAutoMocTarget(target, autogenTargetName,
configIncludes, configDefines);
}
const char* cmakeRoot = makefile->GetSafeDefinition("CMAKE_ROOT"); const char* cmakeRoot = makefile->GetSafeDefinition("CMAKE_ROOT");
std::string inputFile = cmakeRoot; std::string inputFile = cmakeRoot;