diff options
| author | Robert Loehning <robert.loehning@qt.io> | 2016-10-06 17:32:58 +0200 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@qt.io> | 2016-11-04 10:23:25 +0000 |
| commit | c21a3696115a56df3717097e4db6556da43703aa (patch) | |
| tree | cc3d167c5d79632c1b945c75e53f5e817ef04cd9 | |
| parent | e0d704a9c69b77bfc0a1643962487f596b8d46bf (diff) | |
| download | qtwebengine-chromium-c21a3696115a56df3717097e4db6556da43703aa.tar.gz | |
Fix detection of MSVC 2015 Express
Task-number: QTBUG-54263
Done-by: Vladimir Yelnikov
Change-Id: Idf52ac8760f7282d55ae648164a9344441cd24ec
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/tools/gyp/pylib/gyp/MSVSVersion.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/chromium/tools/gyp/pylib/gyp/MSVSVersion.py b/chromium/tools/gyp/pylib/gyp/MSVSVersion.py index d9bfa684fa3..609c6333add 100644 --- a/chromium/tools/gyp/pylib/gyp/MSVSVersion.py +++ b/chromium/tools/gyp/pylib/gyp/MSVSVersion.py @@ -235,6 +235,15 @@ def _CreateVersion(name, path, sdk_based=False): path=path, sdk_based=sdk_based, default_toolset='v140'), + '2015e': VisualStudioVersion('2015e', + 'Visual Studio 2015', + solution_version='12.00', + project_version='14.0', + flat_sln=True, + uses_vcxproj=True, + path=path, + sdk_based=sdk_based, + default_toolset='v140'), '2013': VisualStudioVersion('2013', 'Visual Studio 2013', solution_version='13.00', @@ -364,7 +373,9 @@ def _DetectVisualStudioVersions(versions_to_check, force_express): keys = [r'HKLM\Software\Microsoft\VisualStudio\%s' % version, r'HKLM\Software\Wow6432Node\Microsoft\VisualStudio\%s' % version, r'HKLM\Software\Microsoft\VCExpress\%s' % version, - r'HKLM\Software\Wow6432Node\Microsoft\VCExpress\%s' % version] + r'HKLM\Software\Microsoft\WDExpress\%s' % version, + r'HKLM\Software\Wow6432Node\Microsoft\VCExpress\%s' % version, + r'HKLM\Software\Wow6432Node\Microsoft\WDExpress\%s' % version] for index in range(len(keys)): path = _RegistryGetValue(keys[index], 'InstallDir') if not path: @@ -422,6 +433,7 @@ def SelectVisualStudioVersion(version='auto', allow_fallback=True): '2013': ('12.0',), '2013e': ('12.0',), '2015': ('14.0',), + '2015e': ('14.0',), } override_path = os.environ.get('GYP_MSVS_OVERRIDE_PATH') if override_path: |