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.
pull/52/head
Andrew Dunstan 5 years ago
parent 9e24109f1a
commit a9659fb654
  1. 2
      src/tools/msvc/VSObjectFactory.pm

@ -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);
}

Loading…
Cancel
Save