diff options
author | Sebastian Holtermann <sebholt@xwmw.org> | 2016-11-30 11:17:39 (GMT) |
---|---|---|
committer | Sebastian Holtermann <sebholt@xwmw.org> | 2016-12-06 14:59:26 (GMT) |
commit | f448364de8cd2cd97933020fe0607d2fef3e1bcd (patch) | |
tree | 966b5ea4f4262832ae9a76d76a4e88b0e5c8fa45 /Source/cmQtAutoGeneratorInitializer.cxx | |
parent | 4eadf2ce3f90431fa3ae8a791fde432c6c60b5a1 (diff) | |
download | CMake-f448364de8cd2cd97933020fe0607d2fef3e1bcd.zip CMake-f448364de8cd2cd97933020fe0607d2fef3e1bcd.tar.gz CMake-f448364de8cd2cd97933020fe0607d2fef3e1bcd.tar.bz2 |
QtAutogen: Moc related variable renamed
Diffstat (limited to 'Source/cmQtAutoGeneratorInitializer.cxx')
-rw-r--r-- | Source/cmQtAutoGeneratorInitializer.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx index 7aa7118..4240914 100644 --- a/Source/cmQtAutoGeneratorInitializer.cxx +++ b/Source/cmQtAutoGeneratorInitializer.cxx @@ -870,7 +870,7 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget( std::vector<std::string> skipMoc; std::vector<std::string> mocSources; std::vector<std::string> mocHeaders; - std::map<std::string, std::string> configIncludes; + std::map<std::string, std::string> configMocIncludes; std::map<std::string, std::string> configDefines; std::map<std::string, std::string> configUicOptions; @@ -884,7 +884,7 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget( cmOutputConverter::EscapeForCMake(cmJoin(mocSources, ";")).c_str()); if (target->GetPropertyAsBool("AUTOMOC")) { MocSetupAutoTarget(target, autogenTargetName, skipMoc, mocHeaders, - configIncludes, configDefines); + configMocIncludes, configDefines); } if (target->GetPropertyAsBool("AUTOUIC")) { UicSetupAutoTarget(target, skipUic, configUicOptions); @@ -914,7 +914,7 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget( if (!(perm & mode_write)) { cmSystemTools::SetPermissions(outputFile, perm | mode_write); } - if (!configDefines.empty() || !configIncludes.empty() || + if (!configDefines.empty() || !configMocIncludes.empty() || !configUicOptions.empty()) { cmsys::ofstream infoFile(outputFile.c_str(), std::ios::app); if (!infoFile) { @@ -933,10 +933,10 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget( << it->second << ")\n"; } } - if (!configIncludes.empty()) { + if (!configMocIncludes.empty()) { for (std::map<std::string, std::string>::iterator - it = configIncludes.begin(), - end = configIncludes.end(); + it = configMocIncludes.begin(), + end = configMocIncludes.end(); it != end; ++it) { infoFile << "set(AM_MOC_INCLUDES_" << it->first << " " << it->second << ")\n"; |