mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

VS: Quote custom command arguments containing semicolons

Browse Source 
The `GoogleTest` module needs this to pass the `TEST_EXECUTOR`
definition to its `GoogleTestAddTests.cmake` helper script in
the `POST_BUILD` command since commit f875c479f5 (GoogleTest: Honor
TEST_LAUNCHER in gtest_discover_tests, 2024-01-17, v3.29.0-rc1~34^2).
Previously it worked only if other characters, such as spaces,
caused the argument to be quoted.  This was exposed by running the
`RunCMake.GoogleTest` test in a path without spaces.

Reported-by: Garrett Campbell <gcampbell@microsoft.com>
This commit is contained in:
Brad King
2024-06-13 12:09:06 -04:00
parent 7c6dcba646
commit 9b672e8075
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmOutputConverter.cxx
View File

@@ -450,7 +450,8 @@ bool cmOutputConverter::Shell_CharNeedsQuotes(char c, int flags)
}
} else {
/* On Windows several special characters need quotes to preserve them. */
if (Shell_CharNeedsQuotesOnWindows(c)) {
if (Shell_CharNeedsQuotesOnWindows(c) ||
(c == ';' && (flags & Shell_Flag_VSIDE))) {
return true;
}
}
@@ -670,11 +671,8 @@ std::string cmOutputConverter::Shell_GetArgument(cm::string_view in, int flags)
}
} else if (*cit == ';') {
if (flags & Shell_Flag_VSIDE) {
/* In a VS IDE a semicolon is written ";". If this is written
in an un-quoted argument it starts a quoted segment,
inserts the ; and ends the segment. If it is written in a
quoted argument it ends quoting, inserts the ; and restarts
quoting. Either way the ; is isolated. */
/* In VS a semicolon is written `";"` inside a quoted argument.
It ends quoting, inserts the `;`, and restarts quoting. */
out += "\";\"";
} else {
/* Otherwise a semicolon is written just ;. */