diff options
| author | Zsolt Parragi <zsolt.parragi@cancellar.hu> | 2019-02-21 19:00:38 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-02-27 13:39:02 (GMT) |
| commit | 1a281a1acdcce3d6ce5a2a37fc4e0f6ab77ff0c3 (patch) | |
| tree | a8d5098b79884386177fe13750afa76dedaab571 /Source/cmcmd.cxx | |
| parent | fa339ced67d14bb608b2a71c37c3b99d90941d47 (diff) | |
| download | CMake-1a281a1acdcce3d6ce5a2a37fc4e0f6ab77ff0c3.zip CMake-1a281a1acdcce3d6ce5a2a37fc4e0f6ab77ff0c3.tar.gz CMake-1a281a1acdcce3d6ce5a2a37fc4e0f6ab77ff0c3.tar.bz2 | |
RC: Pass output file in a way that llvm-rc 7 and below understand
Prior to LLVM 8.0, `llvm-rc` does not recognize `/fo` without a space
after it. Add the space unconditionally because MS `rc` accepts it too.
Issue: #18957
Diffstat (limited to 'Source/cmcmd.cxx')
| -rw-r--r-- | Source/cmcmd.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index adfce37..28f5e08 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -1830,7 +1830,8 @@ int cmVSLink::LinkIncremental() // Compile the resource file. std::vector<std::string> rcCommand; rcCommand.push_back(this->RcPath.empty() ? "rc" : this->RcPath); - rcCommand.push_back("/fo" + this->ManifestFileRes); + rcCommand.emplace_back("/fo"); + rcCommand.push_back(this->ManifestFileRes); rcCommand.push_back(this->ManifestFileRC); if (!RunCommand("RC Pass 1", rcCommand, this->Verbose, FORMAT_DECIMAL)) { return -1; |