diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-30 12:57:38 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-10-30 12:57:38 (GMT) |
| commit | 469ac58925554bdea3f73cb77e99e9787d7bef95 (patch) | |
| tree | bbd0adcff381ef2cc6a230fdd9da5313df1013ce | |
| parent | da00080ed495535c4ca1a20c3133f4830c32b4a3 (diff) | |
| parent | a8bf0b2b376cf61f6fb3d2a504021a589aed32d5 (diff) | |
| download | CMake-469ac58925554bdea3f73cb77e99e9787d7bef95.zip CMake-469ac58925554bdea3f73cb77e99e9787d7bef95.tar.gz CMake-469ac58925554bdea3f73cb77e99e9787d7bef95.tar.bz2 | |
Merge branch 'autogen-qrc-file-name' into release-3.10
Merge-request: !1422
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index f13312f..a01d5d6 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -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()); |