Wireshark-commits: [Wireshark-commits] master 8c26217: CMake: bail out if minimum GLib version is n

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: Fri, 19 Apr 2019 17:29:17 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8c2621754803ae0c0dca92f423c43222c1f61d9e
Submitter: "Peter Wu <peter@xxxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

8c26217 by Peter Wu (peter@xxxxxxxxxxxxx):

    CMake: bail out if minimum GLib version is not satisfied
    
    Require glibconfig.h to be found and extract the version from this file,
    this has been present since the original GLib commit and is still
    present in the meson build system introduced with 2.53.4.
    
    Bug: 15706
    Change-Id: I2e938a339d48d6815ed7cc46462735b93418377f
    Reviewed-on: https://code.wireshark.org/review/32894
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: João Valverde <j@xxxxxx>
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    

Actions performed:

    from  3f9579e   wsutil: use environment variable WIRESHARK_EXTCAP_DIR when possible
     add  8c26217   CMake: bail out if minimum GLib version is not satisfied


Summary of changes:
 CMakeLists.txt                |  3 +--
 cmake/modules/FindGLIB2.cmake | 35 ++++++++++++++++++++++++-----------
 2 files changed, 25 insertions(+), 13 deletions(-)