summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-10-24 12:28:57 (GMT)
committerKitware Robot <kwrobot@kitware.com>2023-10-24 12:29:09 (GMT)
commit2b14b21e4044026dae0f9e18e387243a1bc2bfe7 (patch)
tree8235a92e02a88db1b0ad0c94d2095ae4e11bec9c
parent1de0755a76f0363b344fc31df60d284585b4d517 (diff)
parent03080d18eb20548f573bf5ff5a66c8eb38a6ebca (diff)
downloadCMake-2b14b21e4044026dae0f9e18e387243a1bc2bfe7.zip
CMake-2b14b21e4044026dae0f9e18e387243a1bc2bfe7.tar.gz
CMake-2b14b21e4044026dae0f9e18e387243a1bc2bfe7.tar.bz2
Merge topic 'cmcldeps-quote-rc'
03080d18eb cmcldeps: Restore support for rc.exe path not fully GetShortPathName-d Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8912
-rw-r--r--Source/cmcldeps.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index 72805d3..5310166 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -285,7 +285,8 @@ int main()
return exit_code;
// compile rc file with rc.exe
- return process(srcfilename, "", objfile, prefix, binpath + " " + rest,
+ std::string rc = cmStrCat('"', binpath, '"');
+ return process(srcfilename, "", objfile, prefix, cmStrCat(rc, ' ', rest),
std::string(), true);
}