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:08 (GMT)
commit81dc8b9db8acc92669e348efdd2426a4dfb93807 (patch)
tree19c4289df515c1061e44a99e53c79c1f4cd17908
parentb93e602e28f9efa3f8e4518cdd685a140a90d4a0 (diff)
parent03080d18eb20548f573bf5ff5a66c8eb38a6ebca (diff)
downloadCMake-81dc8b9db8acc92669e348efdd2426a4dfb93807.zip
CMake-81dc8b9db8acc92669e348efdd2426a4dfb93807.tar.gz
CMake-81dc8b9db8acc92669e348efdd2426a4dfb93807.tar.bz2
Merge topic 'cmcldeps-quote-rc' into release-3.28
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);
}