Skip to content

Commit a55de3c

Browse files
azuojonahgraham
authored andcommitted
Improved MSVC detection by using latest command line options to vswhere
Ref: https://github.com/microsoft/vswhere/wiki/Find-VC#batch Fixes #929
1 parent 6574af3 commit a55de3c

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

windows/org.eclipse.cdt.msw.build/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.cdt.msw.build;singleton:=true
5-
Bundle-Version: 2.0.400.qualifier
5+
Bundle-Version: 2.0.500.qualifier
66
Bundle-Activator: org.eclipse.cdt.msw.build.Activator
77
Bundle-Localization: plugin
88
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.0,4)",

windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/internal/msw/build/VSInstallationRegistry.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ private static VSInstallation detectVSInstallation(VSVersionNumber baseVersion)
4949
String versionFilterRange = "[" + baseVersion.toString() + "," + upperBound + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
5050
String vsInstallationLocation[] = ProcessOutputUtil.getAllOutputFromCommand("cmd", "/c", //$NON-NLS-1$//$NON-NLS-2$
5151
"\"\"%ProgramFiles(x86)%\\Microsoft Visual Studio\\Installer\\vswhere.exe\"\"", //$NON-NLS-1$
52+
"-products", "*", "-requires", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
5253
"-version", versionFilterRange, "-property", "installationPath"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
5354
if (vsInstallationLocation == null || vsInstallationLocation.length == 0
5455
|| vsInstallationLocation[0].isEmpty()) {

0 commit comments

Comments
 (0)