From ddd6f0db1ea7e1cda13ce7f86361193548a6c47d Mon Sep 17 00:00:00 2001 From: Sebastian Holtermann Date: Sat, 5 Aug 2017 12:27:11 +0200 Subject: [PATCH] Autogen: Add per-config suffix to moc_predefs.h moc_predefs.h is generated using per-config -D definitions and therefore must be configuration specific as well. --- Source/cmQtAutoGenerators.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index a8ffe3c796..56267d032b 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -647,7 +647,9 @@ void cmQtAutoGenerators::Init(cmMakefile* makefile) // Moc predefs file if (!this->MocPredefsCmd.empty()) { - this->MocPredefsFileRel = "moc_predefs.h"; + this->MocPredefsFileRel = "moc_predefs"; + this->MocPredefsFileRel += this->ConfigSuffix; + this->MocPredefsFileRel += ".h"; this->MocPredefsFileAbs = cmSystemTools::CollapseCombinedPath( this->AutogenBuildDir, this->MocPredefsFileRel); }