Commit a9659fb6 authored by Andrew Dunstan's avatar Andrew Dunstan

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.
parent 9e24109f
......@@ -120,7 +120,7 @@ sub DetermineVisualStudioVersion
$? >> 8 == 0
or croak
"Unable to determine Visual Studio version: The nmake command wasn't found.";
if ($output =~ /(\d+)\.(\d+)\.\d+(\.\d+)?$/m)
if ($output =~ /(\d+)\.(\d+)\.\d+(\.\d+)?/)
{
return _GetVisualStudioVersion($1, $2);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment