Skip to content

Commit 547140f

Browse files
committed
Additinal tweaks for $VSWHERE [skip appveyor]
Signed-off-by: Mats Wichmann <[email protected]>
1 parent 4d7b5ab commit 547140f

File tree

2 files changed

+30
-28
lines changed

2 files changed

+30
-28
lines changed

SCons/Tool/msvc.xml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -885,22 +885,23 @@ Specify the location of <command>vswhere.exe</command>.
885885
the state of compiler support for those editions.
886886
</para>
887887
<para>
888-
Satting the &cv-VSWHERE; variable to the path to a specific
889-
<command>vswhere.exe</command> binary,
888+
Setting the &cv-VSWHERE; variable to the path to a specific
889+
<command>vswhere.exe</command> binary
890890
causes &SCons; to use that binary.
891-
If not set (the default), &SCons; will search for one,
891+
If not set, &SCons; will search for one,
892892
looking in the following locations in order,
893-
using the first found, and updating &cv-VSWHERE; with the location.
894-
</para>
895-
896-
<itemizedlist>
897-
<listitem><para><literal>%ProgramFiles(x86)%\Microsoft Visual Studio\Installer</literal></para></listitem>
898-
<listitem><para><literal>%ProgramFiles%\Microsoft Visual Studio\Installer</literal></para></listitem>
899-
<listitem><para><literal>%ChocolateyInstall%\bin</literal></para></listitem>
900-
<listitem><para><literal>%LOCALAPPDATA%\Microsoft\WinGet\Links</literal></para></listitem>
901-
<listitem><para><literal>~\scoop\shims</literal></para></listitem>
902-
<listitem><para><literal>%SCOOP%\shims</literal></para></listitem>
903-
</itemizedlist>
893+
using the first found
894+
(&cv-VSWHERE; is updated with the location):
895+
</para>
896+
897+
<simplelist type="vert">
898+
<member><literal>%ProgramFiles(x86)%\Microsoft Visual Studio\Installer</literal></member>
899+
<member><literal>%ProgramFiles%\Microsoft Visual Studio\Installer</literal></member>
900+
<member><literal>%ChocolateyInstall%\bin</literal></member>
901+
<member><literal>%LOCALAPPDATA%\Microsoft\WinGet\Links</literal></member>
902+
<member><literal>%USERPROFILE%\scoop\shims</literal></member>
903+
<member><literal>%SCOOP%\shims</literal></member>
904+
</simplelist>
904905

905906

906907
<note>

doc/generated/variables.gen

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9912,22 +9912,23 @@ Specify the location of <command>vswhere.exe</command>.
99129912
the state of compiler support for those editions.
99139913
</para>
99149914
<para>
9915-
Satting the &cv-VSWHERE; variable to the path to a specific
9916-
<command>vswhere.exe</command> binary,
9915+
Setting the &cv-VSWHERE; variable to the path to a specific
9916+
<command>vswhere.exe</command> binary
99179917
causes &SCons; to use that binary.
9918-
If not set (the default), &SCons; will search for one,
9918+
If not set, &SCons; will search for one,
99199919
looking in the following locations in order,
9920-
using the first found, and updating &cv-VSWHERE; with the location.
9921-
</para>
9922-
9923-
<itemizedlist>
9924-
<listitem><para><literal>%ProgramFiles(x86)%\Microsoft Visual Studio\Installer</literal></para></listitem>
9925-
<listitem><para><literal>%ProgramFiles%\Microsoft Visual Studio\Installer</literal></para></listitem>
9926-
<listitem><para><literal>%ChocolateyInstall%\bin</literal></para></listitem>
9927-
<listitem><para><literal>%LOCALAPPDATA%\Microsoft\WinGet\Links</literal></para></listitem>
9928-
<listitem><para><literal>~\scoop\shims</literal></para></listitem>
9929-
<listitem><para><literal>%SCOOP%\shims</literal></para></listitem>
9930-
</itemizedlist>
9920+
using the first found
9921+
(&cv-VSWHERE; is updated with the location):
9922+
</para>
9923+
9924+
<simplelist type="vert">
9925+
<member><literal>%ProgramFiles(x86)%\Microsoft Visual Studio\Installer</literal></member>
9926+
<member><literal>%ProgramFiles%\Microsoft Visual Studio\Installer</literal></member>
9927+
<member><literal>%ChocolateyInstall%\bin</literal></member>
9928+
<member><literal>%LOCALAPPDATA%\Microsoft\WinGet\Links</literal></member>
9929+
<member><literal>%USERPROFILE%\scoop\shims</literal></member>
9930+
<member><literal>%SCOOP%\shims</literal></member>
9931+
</simplelist>
99319932

99329933

99339934
<note>

0 commit comments

Comments
 (0)