diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-04 13:42:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-03-04 13:42:49 (GMT) |
| commit | 6873e984869d7f0f96cc8d93ebe76413d1b14b36 (patch) | |
| tree | 1886594ee93f15913174a2f30088b201c2ec8a0e /Source/cmcmd.cxx | |
| parent | 80898a49d9c60f7f14c1135fe8eb3ba3b162f5fe (diff) | |
| parent | e53a968ed582e28522b65c0f4ca00741294425b8 (diff) | |
| download | CMake-6873e984869d7f0f96cc8d93ebe76413d1b14b36.zip CMake-6873e984869d7f0f96cc8d93ebe76413d1b14b36.tar.gz CMake-6873e984869d7f0f96cc8d93ebe76413d1b14b36.tar.bz2 | |
Merge topic 'llvm-rc'
e53a968ed5 MSVC: Use -D instead of /D in RC_FLAGS
1a281a1acd RC: Pass output file in a way that llvm-rc 7 and below understand
fa339ced67 CMakeVersion.rc: Avoid preprocessor definitions to support llvm-rc
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3007
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 6e1a27c..cefac7a 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -1831,7 +1831,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; |