[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=baf7f954866af1bdb5de310042d0fd2125176b42
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

baf7f95 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    CMake: Look for vcredist_x??.exe in more places.
    
    Look for the redistributable installer in the project library directory
    before %VCINSTALLDIR%. This lets us ship a specific version of the
    redistributable.
    
    Change-Id: I70e5aa90ac5addba5355d1964aeb50e277d1a8d4
    Ping-Bug: 12712
    Reviewed-on: https://code.wireshark.org/review/16922
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit 0eee62affe9e6b935fdc37a0d72d5c27c5c7651a)
    Reviewed-on: https://code.wireshark.org/review/18831
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  2c8422f   androiddump: Set socket connect() timeout to 500ms
    adds  baf7f95   CMake: Look for vcredist_x??.exe in more places.


Summary of changes:
 packaging/nsis/CMakeLists.txt |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)