diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2020-04-17 14:55:55 -0400 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2020-04-17 14:57:15 -0400 |
| commit | 3ca17999f6a3961faa1b60001c01cb7e71513a42 (patch) | |
| tree | 5258586ecb0d3d1a0cf6fca366fbedcce743214a | |
| parent | 46b1b6379a32a8f7d2d3c8971ee2a8a3586b137b (diff) | |
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.
| -rw-r--r-- | src/tools/msvc/VSObjectFactory.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/msvc/VSObjectFactory.pm b/src/tools/msvc/VSObjectFactory.pm index 07be39f2bd8..f8f6b300eba 100644 --- a/src/tools/msvc/VSObjectFactory.pm +++ b/src/tools/msvc/VSObjectFactory.pm @@ -150,7 +150,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); } |