Skip to content

Commit ddac64f

Browse files
committed
Use a slightly more liberal regex to detect Visual Studio version
Apparently in some language versions of Visual Studio nmake outputs some material after the version number and before the end of the line. This has been seen in Chinese versions. Therefore, we no longer demand that the version string comes at the end of a line. Per complaint from Cuiping Lin. Backpatch to all live branches.
1 parent f4a4200 commit ddac64f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/tools/msvc/VSObjectFactory.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ sub DetermineVisualStudioVersion
150150
$? >> 8 == 0
151151
or croak
152152
"Unable to determine Visual Studio version: The nmake command wasn't found.";
153-
if ($output =~ /(\d+)\.(\d+)\.\d+(\.\d+)?$/m)
153+
if ($output =~ /(\d+)\.(\d+)\.\d+(\.\d+)?/)
154154
{
155155
return _GetVisualStudioVersion($1, $2);
156156
}

0 commit comments

Comments
 (0)