Wireshark-commits: [Wireshark-commits] master-3.0 86db127: CMake: bail out if minimum GLib version
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: Fri, 19 Apr 2019 17:29:39 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=86db127280300cf2c3841a7ca37f48be286e3a37
Submitter: "Peter Wu <peter@xxxxxxxxxxxxx>"
Changed: branch: master-3.0
Repository: wireshark

Commits:

86db127 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>
    (cherry picked from commit 5c47854155273f2468db48fbdce9d969e71519a8)
    Reviewed-on: https://code.wireshark.org/review/32899
    

Actions performed:

    from  2a9e0e2   Qt: Do not turn empty parameter values into spaces
     add  86db127   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(-)