diff options
author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-02-15 12:23:27 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2017-02-21 15:12:50 (GMT) |
commit | 25dbfbc2a937379ca78328dfabdf54043340dbd3 (patch) | |
tree | 44dbcba05a215da645c45026001976930cb9309c /Source/cmQtAutoGenerators.cxx | |
parent | 3cc42863a43cd4256efdeb2eda2d235d5533bad9 (diff) | |
download | CMake-25dbfbc2a937379ca78328dfabdf54043340dbd3.zip CMake-25dbfbc2a937379ca78328dfabdf54043340dbd3.tar.gz CMake-25dbfbc2a937379ca78328dfabdf54043340dbd3.tar.bz2 |
Autogen: Rename moc related variables
Diffstat (limited to 'Source/cmQtAutoGenerators.cxx')
-rw-r--r-- | Source/cmQtAutoGenerators.cxx | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index f67543f..ee3dc10 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -529,11 +529,10 @@ void cmQtAutoGenerators::Init() this->AutogenBuildSubDir = this->AutogenTargetName; this->AutogenBuildSubDir += "/"; - this->OutMocCppFilenameRel = this->AutogenBuildSubDir; - this->OutMocCppFilenameRel += "moc_compilation.cpp"; + this->MocCppFilenameRel = this->AutogenBuildSubDir; + this->MocCppFilenameRel += "moc_compilation.cpp"; - this->OutMocCppFilenameAbs = - this->CurrentBinaryDir + this->OutMocCppFilenameRel; + this->MocCppFilenameAbs = this->CurrentBinaryDir + this->MocCppFilenameRel; // Init file path checksum generator fpathCheckSum.setupParentDirs(this->CurrentSourceDir, this->CurrentBinaryDir, @@ -1125,12 +1124,12 @@ bool cmQtAutoGenerators::MocGenerateAll( // Check if we even need to update moc_compilation.cpp if (!automocCppChanged) { // compare contents of the moc_compilation.cpp file - const std::string oldContents = ReadAll(this->OutMocCppFilenameAbs); + const std::string oldContents = ReadAll(this->MocCppFilenameAbs); if (oldContents == automocSource) { // nothing changed: don't touch the moc_compilation.cpp file if (this->Verbose) { std::ostringstream err; - err << "AutoMoc: " << this->OutMocCppFilenameRel << " still up to date" + err << "AutoMoc: " << this->MocCppFilenameRel << " still up to date" << std::endl; this->LogInfo(err.str()); } @@ -1139,17 +1138,17 @@ bool cmQtAutoGenerators::MocGenerateAll( } // Actually write moc_compilation.cpp - this->LogBold("Generating MOC compilation " + this->OutMocCppFilenameRel); + this->LogBold("Generating MOC compilation " + this->MocCppFilenameRel); // Make sure the parent directory exists - bool success = this->MakeParentDirectory(this->OutMocCppFilenameAbs); + bool success = this->MakeParentDirectory(this->MocCppFilenameAbs); if (success) { cmsys::ofstream outfile; - outfile.open(this->OutMocCppFilenameAbs.c_str(), std::ios::trunc); + outfile.open(this->MocCppFilenameAbs.c_str(), std::ios::trunc); if (!outfile) { success = false; std::ostringstream err; - err << "AutoMoc: error opening " << this->OutMocCppFilenameAbs << "\n"; + err << "AutoMoc: error opening " << this->MocCppFilenameAbs << "\n"; this->LogError(err.str()); } else { outfile << automocSource; @@ -1157,7 +1156,7 @@ bool cmQtAutoGenerators::MocGenerateAll( if (!outfile.good()) { success = false; std::ostringstream err; - err << "AutoMoc: error writing " << this->OutMocCppFilenameAbs << "\n"; + err << "AutoMoc: error writing " << this->MocCppFilenameAbs << "\n"; this->LogError(err.str()); } } |