Wireshark-commits: [Wireshark-commits] master 7780159: Fix zlib cmake
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: Sun, 31 May 2015 18:15:11 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=7780159c03276d0e35df30f69d9a4806958c764e
Submitter: Graham Bloice (graham.bloice@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

7780159 by Graham Bloice (graham.bloice@xxxxxxxxxxxxx):

    Fix zlib cmake
    
    Add support for the locally modified version of zlib to suppress
    a CMake warning and disable building of the zlib examples.
    
    Change-Id: I9ae08b49d149951e8626d506f69f1757a1ec7e23
    Reviewed-on: https://code.wireshark.org/review/8706
    Petri-Dish: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
    

Actions performed:

    from  7da74df   VGCS/VBS Assignment Request: Add param dissector
    adds  7780159   Fix zlib cmake


Summary of changes:
 CMakeLists.txt      |    6 ++----
 Makefile.nmake      |    3 ++-
 config.nmake        |    8 ++++----
 tools/win-setup.ps1 |    8 ++++----
 4 files changed, 12 insertions(+), 13 deletions(-)