reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-02-10 05:42:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

QtAutogen: Moc related variable renamed

Browse Source
This commit is contained in:
Sebastian Holtermann 2016-11-30 12:18:47 +01:00
parent f448364de8
commit ff1a01b743
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmQtAutoGeneratorInitializer.cxx
View File

@ -871,7 +871,7 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
std::vector<std::string> mocSources; std::vector<std::string> mocSources;
std::vector<std::string> mocHeaders; std::vector<std::string> mocHeaders;
std::map<std::string, std::string> configMocIncludes; std::map<std::string, std::string> configMocIncludes;
std::map<std::string, std::string> configDefines; std::map<std::string, std::string> configMocDefines;
std::map<std::string, std::string> configUicOptions; std::map<std::string, std::string> configUicOptions;
if (target->GetPropertyAsBool("AUTOMOC") || if (target->GetPropertyAsBool("AUTOMOC") ||
@ -884,7 +884,7 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
cmOutputConverter::EscapeForCMake(cmJoin(mocSources, ";")).c_str()); cmOutputConverter::EscapeForCMake(cmJoin(mocSources, ";")).c_str());
if (target->GetPropertyAsBool("AUTOMOC")) { if (target->GetPropertyAsBool("AUTOMOC")) {
MocSetupAutoTarget(target, autogenTargetName, skipMoc, mocHeaders, MocSetupAutoTarget(target, autogenTargetName, skipMoc, mocHeaders,
configMocIncludes, configDefines); configMocIncludes, configMocDefines);
} }
if (target->GetPropertyAsBool("AUTOUIC")) { if (target->GetPropertyAsBool("AUTOUIC")) {
UicSetupAutoTarget(target, skipUic, configUicOptions); UicSetupAutoTarget(target, skipUic, configUicOptions);
@ -914,7 +914,7 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
if (!(perm & mode_write)) { if (!(perm & mode_write)) {
cmSystemTools::SetPermissions(outputFile, perm | mode_write); cmSystemTools::SetPermissions(outputFile, perm | mode_write);
} }
if (!configDefines.empty() || !configMocIncludes.empty() || if (!configMocDefines.empty() || !configMocIncludes.empty() ||
!configUicOptions.empty()) { !configUicOptions.empty()) {
cmsys::ofstream infoFile(outputFile.c_str(), std::ios::app); cmsys::ofstream infoFile(outputFile.c_str(), std::ios::app);
if (!infoFile) { if (!infoFile) {
@ -924,10 +924,10 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
cmSystemTools::Error(error.c_str()); cmSystemTools::Error(error.c_str());
return; return;
} }
if (!configDefines.empty()) { if (!configMocDefines.empty()) {
for (std::map<std::string, std::string>::iterator for (std::map<std::string, std::string>::iterator
it = configDefines.begin(), it = configMocDefines.begin(),
end = configDefines.end(); end = configMocDefines.end();
it != end; ++it) { it != end; ++it) {
infoFile << "set(AM_MOC_COMPILE_DEFINITIONS_" << it->first << " " infoFile << "set(AM_MOC_COMPILE_DEFINITIONS_" << it->first << " "
<< it->second << ")\n"; << it->second << ")\n";