diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-31 12:54:14 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-10-31 12:54:26 (GMT) |
| commit | 9ba15bfcebac56b51d9504bf6e46907e25fc96f3 (patch) | |
| tree | 148362c8e968bc3b3157a03f0c10bf6d26e82b6d | |
| parent | 562bcb84ab5dcca0a49104b0dab3b8a02881a0dc (diff) | |
| parent | bda0875ac352563e0705a1da90904fdda48005a0 (diff) | |
| download | CMake-9ba15bfcebac56b51d9504bf6e46907e25fc96f3.zip CMake-9ba15bfcebac56b51d9504bf6e46907e25fc96f3.tar.gz CMake-9ba15bfcebac56b51d9504bf6e46907e25fc96f3.tar.bz2 | |
Merge topic 'autogen-change-rcc-config-suffix'
bda0875a Autogen: Make rcc output file suffix static (instead of pseudo-random)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Taylor Braun-Jones <taylor@braun-jones.org>
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; |