Wireshark-commits: [Wireshark-commits] master-2.0 92e8fa5: CMake: Don't clobber ZLIB_*.
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: Tue, 6 Oct 2015 21:42:40 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=92e8fa54dbe185c522c09d3370d2a97e1982a91c
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

92e8fa5 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    CMake: Don't clobber ZLIB_*.
    
    On Windows we set a few (but not all) ZLIB_* variables, then depend on
    FindZLIB to fill in the rest. Make sure FindZLIB doesn't unset everything
    the first time we run CMake.
    
    Bug: 11569
    Change-Id: I199c83570c29343466b9ff63080b6a964dfd8d73
    Reviewed-on: https://code.wireshark.org/review/10843
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    (cherry picked from commit 81d8b7dcdcf67ef530deea0002a638aa57724c51)
    Reviewed-on: https://code.wireshark.org/review/10846
    

Actions performed:

    from  4b4fc34   Another (blind) attempt to fix CMake builds
    adds  92e8fa5   CMake: Don't clobber ZLIB_*.


Summary of changes:
 cmake/modules/FindZLIB.cmake |   79 ++++++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 38 deletions(-)