Wireshark-commits: [Wireshark-commits] master a6da149: NSIS: Fix our extra installer location.

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 18 Mar 2019 23:47:43 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=a6da14982b2df222af81f89fa2db95b07fdf0388
Submitter: "Gerald Combs <gerald@xxxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

a6da149 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    NSIS: Fix our extra installer location.
    
    We know the native Windows library path early on in the configure
    process. Use it to set the location of the Npcap and USBPcap installers
    instead of trying to derive it from the GLib DLL path.
    
    Change-Id: I02d48e115b374fb6080a7fe8017cba789254d5f1
    Reviewed-on: https://code.wireshark.org/review/32475
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  36ba6b8   Windows: Switch to Npcap 0.991.
     add  a6da149   NSIS: Fix our extra installer location.


Summary of changes:
 CMakeLists.txt                | 2 ++
 packaging/nsis/CMakeLists.txt | 7 +------
 packaging/nsis/config.nsh.in  | 2 +-
 packaging/nsis/wireshark.nsi  | 4 ++--
 4 files changed, 6 insertions(+), 9 deletions(-)