mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-27 17:39:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'autogen-qrc-file-name' into release-3.10

Browse Source 
Merge-request: !1422
This commit is contained in:
Brad King
2017-10-30 08:57:38 -04:00
parent da00080ed4 a8bf0b2b37
commit 469ac58925
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmQtAutoGenerators.cxx
+15 -5
View File
@@ -1931,11 +1931,21 @@ bool cmQtAutoGenerators::RccGenerateFile(const RccJob& rccJob)
bool rccGenerated = false;
std::string rccFileAbs;
if (this->MultiConfig == cmQtAutoGen::SINGLE) {
rccFileAbs = rccJob.RccFile;
} else {
rccFileAbs =
cmQtAutoGen::AppendFilenameSuffix(rccJob.RccFile, this->ConfigSuffix);
{
std::string suffix;
switch (this->MultiConfig) {
case cmQtAutoGen::SINGLE:
break;
case cmQtAutoGen::WRAP:
suffix = this->ConfigSuffix;
suffix += "_";
suffix += this->FilePathChecksum.getPart(rccJob.RccFile, 4);
break;
case cmQtAutoGen::FULL:
suffix = this->ConfigSuffix;
break;
}
rccFileAbs = cmQtAutoGen::AppendFilenameSuffix(rccJob.RccFile, suffix);
}
std::string const rccFileRel = cmSystemTools::RelativePath(
this->AutogenBuildDir.c_str(), rccFileAbs.c_str());