From afc8807fcc940e9b31043b1cdca68fd29c23719c Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sun, 12 Apr 2020 15:53:59 -0700 Subject: Address comments on PR for docs --- src/engine/SCons/Tool/msvc.xml | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/engine/SCons/Tool/msvc.xml b/src/engine/SCons/Tool/msvc.xml index 3e8ec95..48ce13f 100644 --- a/src/engine/SCons/Tool/msvc.xml +++ b/src/engine/SCons/Tool/msvc.xml @@ -482,14 +482,23 @@ Specify the location of vswhere.exe. -vswhere.exe is used to locate MSVC/MSVS installations. -It was initially distributed with MSVS 2017. But can detect MSVC 2010 and newer with -legacy argument. +Propose: The vswhere command is distributed with Microsoft Visual Studio and Build + Tools since the 2017 edition, but is also available standalone. It fully detects 2017 and later editions, + but with the argument, can detect installations of the 2010 through 2015 + editions with limited data returned. If &cv-VSWHERE; is set, SCons will use that location. -Otherwise SCons will look in the following locations and set VSWHERE to the first directory vswhere.exe -is found. + Otherwise SCons will look in the following locations and set &cv-VSWHERE; to the path of the first vswhere.exe +located. + + +%ProgramFiles(x86)%\Microsoft Visual Studio\Installer +"%ProgramFiles%\Microsoft Visual Studio\Installer +%ChocolateyInstall%\bin + + Note that &cv-VSWHERE; must be set at the same time or prior to the msvc tool being initialized. So either set it as follows Environment(VSWHERE='c:/my/path/to/vswhere') or @@ -499,11 +508,7 @@ if your Environment() is created specifying no tools tools=[] - -%ProgramFiles(x86)%\Microsoft Visual Studio\Installer -"%ProgramFiles%\Microsoft Visual Studio\Installer -%ChocolateyInstall%\bin - + -- cgit v0.12