diff options
author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-08-05 10:08:14 (GMT) |
---|---|---|
committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-08-05 10:08:14 (GMT) |
commit | e2c9cf12d12c23a0ef68801b8a9ac4b832ea88bc (patch) | |
tree | a0ec3fd62a43885dc3232c82cecc2dd7a365959d /Source/cmQtAutoGenerators.cxx | |
parent | 3a4840e0395133e0b28d5b1f424bf7365b5dd0e6 (diff) | |
download | CMake-e2c9cf12d12c23a0ef68801b8a9ac4b832ea88bc.zip CMake-e2c9cf12d12c23a0ef68801b8a9ac4b832ea88bc.tar.gz CMake-e2c9cf12d12c23a0ef68801b8a9ac4b832ea88bc.tar.bz2 |
Autogen: Remove per-config suffix for mocs_compilations.cpp
Diffstat (limited to 'Source/cmQtAutoGenerators.cxx')
-rw-r--r-- | Source/cmQtAutoGenerators.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index feec735..a8ffe3c 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -636,9 +636,7 @@ bool cmQtAutoGenerators::SettingsFileWrite() void cmQtAutoGenerators::Init(cmMakefile* makefile) { // Mocs compilation file - this->MocCompFileRel = "mocs_compilation"; - this->MocCompFileRel += this->ConfigSuffix; - this->MocCompFileRel += ".cpp"; + this->MocCompFileRel = "mocs_compilation.cpp"; this->MocCompFileAbs = cmSystemTools::CollapseCombinedPath( this->AutogenBuildDir, this->MocCompFileRel); @@ -724,10 +722,10 @@ bool cmQtAutoGenerators::RunAutogen() // the program goes through all .cpp files to see which moc files are // included. It is not really interesting how the moc file is named, but // what file the moc is created from. Once a moc is included the same moc - // may not be included in the mocs_compilation_$<CONFIG>.cpp file anymore. + // may not be included in the mocs_compilation.cpp file anymore. // OTOH if there's a header containing Q_OBJECT where no corresponding // moc file is included anywhere a moc_<filename>.cpp file is created and - // included in the mocs_compilation_$<CONFIG>.cpp file. + // included in the mocs_compilation.cpp file. // key = moc source filepath, value = moc output filepath std::map<std::string, std::string> mocsIncluded; |