mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 08:20:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Autogen: Include moc/uic/rcc binary in settings hash

Browse Source
This commit is contained in:
Sebastian Holtermann
2017-05-13 10:14:23 +02:00
parent 836cb52e9a
commit ab39dd11f5
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Source/cmQtAutoGenerators.cxx
View File

@@ -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);
}
}