Wireshark-commits: [Wireshark-commits] master 0eee62a: CMake: Look for vcredist_x??.exe in more pla
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sat, 6 Aug 2016 07:29:27 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0eee62affe9e6b935fdc37a0d72d5c27c5c7651a
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

0eee62a 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>
    

Actions performed:

    from  b626ad1   extcap: move defines from sshdump & ciscodump to ssh-base.
    adds  0eee62a   CMake: Look for vcredist_x??.exe in more places.


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