From ab39dd11f5ba134b56dc802584f33c2c46df7f09 Mon Sep 17 00:00:00 2001 From: Sebastian Holtermann Date: Sat, 13 May 2017 10:14:23 +0200 Subject: Autogen: Include moc/uic/rcc binary in settings hash --- Source/cmQtAutoGenerators.cxx | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 7461a0a..15d206a 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -517,32 +517,39 @@ void cmQtAutoGenerators::SettingsFileRead(cmMakefile* makefile) // Compose current settings strings { cmCryptoHash crypt(cmCryptoHash::AlgoSHA256); + const std::string sep(" ~~~ "); if (this->MocEnabled()) { std::string str; + str += this->MocExecutable; + str += sep; str += JoinOptionsList(this->MocDefinitions); - str += " ~~~ "; + str += sep; str += JoinOptionsList(this->MocIncludePaths); - str += " ~~~ "; + str += sep; str += JoinOptionsList(this->MocOptions); - str += " ~~~ "; + str += sep; str += this->IncludeProjectDirsBefore ? "TRUE" : "FALSE"; - str += " ~~~ "; + str += sep; str += JoinOptionsList(this->MocPredefsCmd); - str += " ~~~ "; + str += sep; this->SettingsStringMoc = crypt.HashString(str); } if (this->UicEnabled()) { std::string str; + str += this->UicExecutable; + str += sep; str += JoinOptionsList(this->UicTargetOptions); - str += " ~~~ "; + str += sep; str += JoinOptionsMap(this->UicOptions); - str += " ~~~ "; + str += sep; this->SettingsStringUic = crypt.HashString(str); } if (this->RccEnabled()) { std::string str; + str += this->RccExecutable; + str += sep; str += JoinOptionsMap(this->RccOptions); - str += " ~~~ "; + str += sep; this->SettingsStringRcc = crypt.HashString(str); } } -- cgit v0.12 From b95fbbe55328d583f77280eca862a7951d19d836 Mon Sep 17 00:00:00 2001 From: Sebastian Holtermann Date: Sat, 13 May 2017 10:25:46 +0200 Subject: Autogen: Add -DWIN32 to definitions list on demand --- Source/cmQtAutoGenerators.cxx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 15d206a..d40e809 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -396,6 +396,14 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile( if (this->MocEnabled()) { InfoGet(makefile, "AM_MOC_SKIP", this->MocSkipList); InfoGet(makefile, "AM_MOC_DEFINITIONS", config, this->MocDefinitions); +#ifdef _WIN32 + { + const std::string win32("WIN32"); + if (!ListContains(this->MocDefinitions, win32)) { + this->MocDefinitions.push_back(win32); + } + } +#endif InfoGet(makefile, "AM_MOC_INCLUDES", config, this->MocIncludePaths); InfoGet(makefile, "AM_MOC_OPTIONS", this->MocOptions); InfoGet(makefile, "AM_MOC_RELAXED_MODE", this->MocRelaxedMode); @@ -1221,9 +1229,6 @@ bool cmQtAutoGenerators::MocGenerateAll( this->MocDefinitions.begin(); it != this->MocDefinitions.end(); ++it) { cmd.push_back("-D" + (*it)); -#ifdef _WIN32 - cmd.push_back("-DWIN32"); -#endif } // Add options cmd.insert(cmd.end(), this->MocOptions.begin(), @@ -1369,9 +1374,6 @@ bool cmQtAutoGenerators::MocGenerateFile( it != this->MocDefinitions.end(); ++it) { cmd.push_back("-D" + (*it)); } -#ifdef _WIN32 - cmd.push_back("-DWIN32"); -#endif // Add options cmd.insert(cmd.end(), this->MocOptions.begin(), this->MocOptions.end()); // Add predefs include -- cgit v0.12