Wireshark-commits: [Wireshark-commits] master 69a435b: Add zlib compilation to CMake on Windows

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: Tue, 7 Apr 2015 20:51:30 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=69a435bb082578eaf191fa1ce27929b869c29788
Submitter: Graham Bloice (graham.bloice@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

69a435b by Graham Bloice (graham.bloice@xxxxxxxxxxxxx):

    Add zlib compilation to CMake on Windows
    
    Modify CMake to compile zlib, removing need for an nmake compilation
    of zlib before running CMake.
    
    Change-Id: I63cead55b14d6a2e22b1b6a8536eaf9260e21231
    Reviewed-on: https://code.wireshark.org/review/7864
    Petri-Dish: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Reviewed-by: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
    

Actions performed:

    from  77f87b7   Byte view tab (Qt): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
    adds  69a435b   Add zlib compilation to CMake on Windows


Summary of changes:
 CMakeLists.txt |   21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)