diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-30 17:58:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-10-30 17:58:55 (GMT) |
| commit | f49b6871e9f6de4948e8aa34446a1c933ca97935 (patch) | |
| tree | 032ab1d1513fbc3f81150c2e610b6db55a75698e | |
| parent | 469ac58925554bdea3f73cb77e99e9787d7bef95 (diff) | |
| parent | bda0875ac352563e0705a1da90904fdda48005a0 (diff) | |
| download | CMake-f49b6871e9f6de4948e8aa34446a1c933ca97935.zip CMake-f49b6871e9f6de4948e8aa34446a1c933ca97935.tar.gz CMake-f49b6871e9f6de4948e8aa34446a1c933ca97935.tar.bz2 | |
Merge branch 'autogen-change-rcc-config-suffix' into release-3.10
Merge-request: !1425
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index a01d5d6..87c0f89 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -1937,9 +1937,9 @@ bool cmQtAutoGenerators::RccGenerateFile(const RccJob& rccJob) case cmQtAutoGen::SINGLE: break; case cmQtAutoGen::WRAP: - suffix = this->ConfigSuffix; + suffix = "_CMAKE"; + suffix += this->ConfigSuffix; suffix += "_"; - suffix += this->FilePathChecksum.getPart(rccJob.RccFile, 4); break; case cmQtAutoGen::FULL: suffix = this->ConfigSuffix; |