Wireshark-commits: [Wireshark-commits] master-2.6 f2fb1e7: Don't fail in CMake on Windows if you've
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, 16 Feb 2019 22:35:27 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f2fb1e729279a922bc477efc4a5db9a2bd3309ae
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

f2fb1e7 by Guy Harris (guy@xxxxxxxxxxxx):

    Don't fail in CMake on Windows if you've disabled building Wireshark.
    
    It's possible to do a *build* on Windows without the Wireshark app being
    built; however, the *installers* can't currently be built.
    
    If we have NSIS or WiX, and Wireshark isn't being built, report a
    warning, and don't have targets for building the installers.
    
    Change-Id: I2cc9c1f6ba375dbcb6d5b7520d2fa33ad97ba9fe
    Reviewed-on: https://code.wireshark.org/review/32061
    Petri-Dish: Guy Harris <guy@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 29ac5a9e61edcde7d7f517be3b9734bf29ad8dc9)
    Reviewed-on: https://code.wireshark.org/review/32064
    

Actions performed:

    from  7d7fb7c   Don't allow NSIS or WiX installers if we aren't building Wireshark.
     add  f2fb1e7   Don't fail in CMake on Windows if you've disabled building Wireshark.


Summary of changes:
 packaging/nsis/CMakeLists.txt | 102 ++++++++++++++++--------------
 packaging/wix/CMakeLists.txt  | 140 ++++++++++++++++++++++--------------------
 2 files changed, 128 insertions(+), 114 deletions(-)