URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=4e6a80f3e31a5bce8b162abd1a1069ca1e923ed1
Submitter: "Peter Wu <peter@xxxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark
Commits:
4e6a80f by Peter Wu (peter@xxxxxxxxxxxxx):
NSIS: try harder to find VS2015/VS2017 vcredist
The vcredist version (directory name) has changed. Instead of listing
all possible versions, just glob for it. I only observed a single
directory anyway.
As CMake can find compilers without vcvarsall.bat, it is possible that
env var VCINSTALLDIR is not set. Fallback to querying the location from
the registry (as was done in VS2015).
The MSVC_VERSION/VS/VCRT table is partially based on
https://blogs.msdn.microsoft.com/vcblog/2017/11/15/side-by-side-minor-version-msvc-toolsets-in-visual-studio-2017/
Change-Id: I58107597c5037ab597a0d620925cb870e6ef7793
Reviewed-on: https://code.wireshark.org/review/28980
Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
Actions performed:
from 5f81656 h265: fix no newline at end of file [-Wnewline-eof]
add 4e6a80f NSIS: try harder to find VS2015/VS2017 vcredist
Summary of changes:
packaging/nsis/CMakeLists.txt | 43 ++++++++++++++++++++++++++++++-------------
1 file changed, 30 insertions(+), 13 deletions(-)