summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-10-19 13:59:48 (GMT)
committerKitware Robot <kwrobot@kitware.com>2022-10-19 13:59:59 (GMT)
commit86ed35cf63c0ad2592185607805be793091dc882 (patch)
tree27f3f316c858703b2b513618915d6acc547c68ab
parent9ece08666d35bec66e8ac741350f984048b32e13 (diff)
parent9777e4c30e55fb84c13727b322665f116fa49473 (diff)
downloadCMake-86ed35cf63c0ad2592185607805be793091dc882.zip
CMake-86ed35cf63c0ad2592185607805be793091dc882.tar.gz
CMake-86ed35cf63c0ad2592185607805be793091dc882.tar.bz2
Merge topic 'mingw-unc' into release-3.25
9777e4c30e MinGW Makefiles: Quote UNC paths on command lines Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7802
-rw-r--r--Source/cmOutputConverter.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/cmOutputConverter.cxx b/Source/cmOutputConverter.cxx
index 6883535..299ab3a 100644
--- a/Source/cmOutputConverter.cxx
+++ b/Source/cmOutputConverter.cxx
@@ -527,6 +527,13 @@ bool cmOutputConverter::Shell_ArgumentNeedsQuotes(cm::string_view in,
}
}
+ /* UNC paths in MinGW Makefiles need quotes. */
+ if ((flags & Shell_Flag_MinGWMake) && (flags & Shell_Flag_Make)) {
+ if (in.size() > 1 && in[0] == '\\' && in[1] == '\\') {
+ return true;
+ }
+ }
+
return false;
}