Wireshark-commits: [Wireshark-commits] master 8e1cc70: Fix detection of NSIS/WiX install path when

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: Sat, 9 Jul 2016 07:22:27 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8e1cc70fd57e958ef5f062f1a6367d85ebc9fed1
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

8e1cc70 by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    Fix detection of NSIS/WiX install path when running a win64 CMake
    
    On x86 system:
    System32\cmd.exe
    ProgramFiles=C:\Program Files
    
    On x64 system:
    System32\cmd.exe
    ProgramFiles=C:\Program Files
    ProgramFiles(x86)=C:\Program Files (x86)
    ProgramW6432=C:\Program Files
    Syswow64\cmd.exe
    ProgramFiles=C:\Program Files (x86)
    ProgramFiles(x86)=C:\Program Files (x86)
    ProgramW6432=C:\Program Files
    
    Change-Id: I32d52219366b299f1e8099dc6d7737970dc398dd
    Reviewed-on: https://code.wireshark.org/review/16346
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    

Actions performed:

    from  01c6483   Check for pcapng files when reading from a pipe.
    adds  8e1cc70   Fix detection of NSIS/WiX install path when running a win64 CMake


Summary of changes:
 cmake/modules/FindNSIS.cmake |    3 ++-
 cmake/modules/FindWiX.cmake  |    8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)