osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Docbook: Windows toolchain updates. 

Visual Studio and Qt tend to install their own copies of CMake.

We build the 3.6 branch with Visual C++ 2019.
This commit is contained in:
Gerald Combs 2021-12-05 10:41:32 -08:00 committed by Wireshark GitLab Utility
parent 34f3a902f8
commit c939df8f61
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docbook/wsdg_src/WSDG_chapter_quick_setup.adoc
View File

@ -247,8 +247,8 @@ all the optional components other than the “V{cpp} 2019” item with the
“latest ... tools”, the “Windows 10 SDK”, and the “Visual {cpp} tools for
CMake” (unless you want to use them for purposes other than Wireshark).
You can use Chocolatey to install Visual Studio, using the Visual Studio
Community and Native Desktop workload packages.
You can alternatively use Chocolatey to install Visual Studio, using the Visual Studio Community and Native Desktop workload packages.
Note that this includes CMake.
----
PS$> choco install -y visualstudio2019community visualstudio2019-workload-nativedesktop
@ -382,10 +382,13 @@ https://git-scm.com/downloads/guis
==== Install CMake
Get the CMake installer from https://cmake.org/download/[] and install CMake into
the default location. Ensure the directory containing cmake.exe is added to your path.
While CMake is required to build Wireshark, it might have been installed as a component of either Visual Studio or Qt.
If that’s the case you can skip this step.
If you do want or need to install CMake, you can get it from https://cmake.org/download/[].
Installing CMake into the default location is recommended.
Ensure the directory containing cmake.exe is added to your path.
Alternatively you can install CMake using Chocolatey:
Alternatively you can install it using Chocolatey:
----
PS$> choco install -y cmake

1
docbook/wsdg_src/WSDG_chapter_tools.adoc
View File

@ -292,6 +292,7 @@ _windows.h_, _WS2_32.lib_)
Official releases are or were built with the following Visual {cpp} versions:
* Wireshark 3.6.x: Microsoft Visual {cpp} 2019.
* Wireshark 3.4.x: Microsoft Visual {cpp} 2019.
* Wireshark 3.2.x: Microsoft Visual {cpp} 2019.
* Wireshark 3.0.x: Microsoft Visual {cpp} 2017.