diff options
| author | Zsolt Parragi <zsolt.parragi@cancellar.hu> | 2019-02-21 20:00:38 +0100 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-02-27 08:39:02 -0500 |
| commit | 1a281a1acdcce3d6ce5a2a37fc4e0f6ab77ff0c3 (patch) | |
| tree | a8d5098b79884386177fe13750afa76dedaab571 | |
| parent | fa339ced67d14bb608b2a71c37c3b99d90941d47 (diff) | |
| download | cmake-1a281a1acdcce3d6ce5a2a37fc4e0f6ab77ff0c3.tar.gz | |
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
| -rw-r--r-- | Modules/CMakeRCInformation.cmake | 2 | ||||
| -rw-r--r-- | Source/cmcldeps.cxx | 2 | ||||
| -rw-r--r-- | Source/cmcmd.cxx | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/Modules/CMakeRCInformation.cmake b/Modules/CMakeRCInformation.cmake index 1227fdf263..7bf6567752 100644 --- a/Modules/CMakeRCInformation.cmake +++ b/Modules/CMakeRCInformation.cmake @@ -32,7 +32,7 @@ set(CMAKE_INCLUDE_FLAG_RC "-I") # compile a Resource file into an object file if(NOT CMAKE_RC_COMPILE_OBJECT) set(CMAKE_RC_COMPILE_OBJECT - "<CMAKE_RC_COMPILER> <DEFINES> <INCLUDES> <FLAGS> /fo<OBJECT> <SOURCE>") + "<CMAKE_RC_COMPILER> <DEFINES> <INCLUDES> <FLAGS> /fo <OBJECT> <SOURCE>") endif() # set this variable so we can avoid loading this more than once. diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx index 1a10666c57..19d0d38438 100644 --- a/Source/cmcldeps.cxx +++ b/Source/cmcldeps.cxx @@ -276,7 +276,7 @@ int main() std::string clrest = rest; // rc: /fo x.dir\x.rc.res -> cl: /out:x.dir\x.rc.res.dep.obj - clrest = replace(clrest, "/fo", "/out:"); + clrest = replace(clrest, "/fo ", "/out:"); clrest = replace(clrest, objfile, objfile + ".dep.obj "); cl = "\"" + cl + "\" /P /DRC_INVOKED /TC "; diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index adfce37441..28f5e080a8 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; |