diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-16 15:50:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-10-16 15:57:15 (GMT) |
| commit | f566586e1ce2905615fb778266165fd862e3a028 (patch) | |
| tree | 88a783a7c3c60b74d7b70a616d7676729a98e9ef /Source/cmVSSetupHelper.h | |
| parent | c6bb704ea1e2a2c91605e390900d69bd51269fc9 (diff) | |
| download | CMake-f566586e1ce2905615fb778266165fd862e3a028.zip CMake-f566586e1ce2905615fb778266165fd862e3a028.tar.gz CMake-f566586e1ce2905615fb778266165fd862e3a028.tar.bz2 | |
VS: Detect compiler component in VS 2017 instances more reliably
The `Microsoft.VisualStudio.Component.VC.Tools.x86.x64` component is
not the only way a VS instance may provide the `cl` compiler tool.
For example, VS 2017 Express Edition does not install that component.
Instead search for the tools directly on disk within an instance.
Suggested-by: Rich Chiodo <rchiodo@microsoft.com>
Fixes: #17349
Diffstat (limited to 'Source/cmVSSetupHelper.h')
| -rw-r--r-- | Source/cmVSSetupHelper.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmVSSetupHelper.h b/Source/cmVSSetupHelper.h index 5c6c285..74a7ec0 100644 --- a/Source/cmVSSetupHelper.h +++ b/Source/cmVSSetupHelper.h @@ -136,8 +136,7 @@ private: bool GetVSInstanceInfo(SmartCOMPtr<ISetupInstance2> instance2, VSInstanceInfo& vsInstanceInfo); bool CheckInstalledComponent(SmartCOMPtr<ISetupPackageReference> package, - bool& bVCToolset, bool& bWin10SDK, - bool& bWin81SDK); + bool& bWin10SDK, bool& bWin81SDK); int ChooseVSInstance(const std::vector<VSInstanceInfo>& vecVSInstances); bool EnumerateAndChooseVSInstance(); |