summaryrefslogtreecommitdiffstats
path: root/Source/cmQtAutoGeneratorInitializer.cxx
diff options
context:
space:
mode:
authorSebastian Holtermann <sebholt@xwmw.org>2016-11-30 11:18:47 (GMT)
committerSebastian Holtermann <sebholt@xwmw.org>2016-12-06 14:59:26 (GMT)
commitff1a01b743dc70e555fb0fc61eb4d019eb25df76 (patch)
treefcde5498c8d8198a4f8ffabebde1c1fa18dbd918 /Source/cmQtAutoGeneratorInitializer.cxx
parentf448364de8cd2cd97933020fe0607d2fef3e1bcd (diff)
downloadCMake-ff1a01b743dc70e555fb0fc61eb4d019eb25df76.zip
CMake-ff1a01b743dc70e555fb0fc61eb4d019eb25df76.tar.gz
CMake-ff1a01b743dc70e555fb0fc61eb4d019eb25df76.tar.bz2
QtAutogen: Moc related variable renamed
Diffstat (limited to 'Source/cmQtAutoGeneratorInitializer.cxx')
-rw-r--r--Source/cmQtAutoGeneratorInitializer.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 4240914..44323bc 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -871,7 +871,7 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
std::vector<std::string> mocSources;
std::vector<std::string> mocHeaders;
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;
if (target->GetPropertyAsBool("AUTOMOC") ||
@@ -884,7 +884,7 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
cmOutputConverter::EscapeForCMake(cmJoin(mocSources, ";")).c_str());
if (target->GetPropertyAsBool("AUTOMOC")) {
MocSetupAutoTarget(target, autogenTargetName, skipMoc, mocHeaders,
- configMocIncludes, configDefines);
+ configMocIncludes, configMocDefines);
}
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() || !configMocIncludes.empty() ||
+ if (!configMocDefines.empty() || !configMocIncludes.empty() ||
!configUicOptions.empty()) {
cmsys::ofstream infoFile(outputFile.c_str(), std::ios::app);
if (!infoFile) {
@@ -924,10 +924,10 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
cmSystemTools::Error(error.c_str());
return;
}
- if (!configDefines.empty()) {
+ if (!configMocDefines.empty()) {
for (std::map<std::string, std::string>::iterator
- it = configDefines.begin(),
- end = configDefines.end();
+ it = configMocDefines.begin(),
+ end = configMocDefines.end();
it != end; ++it) {
infoFile << "set(AM_MOC_COMPILE_DEFINITIONS_" << it->first << " "
<< it->second << ")\n";