Wireshark-commits: [Wireshark-commits] master-3.2 8df9cfb: CMake: Fix FindGLIB2 for saner output
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: Sat, 02 May 2020 07:39:57 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8df9cfbc79794a224006002ed43c6698ce1e56dd
Submitter: "João Valverde <j@xxxxxx>"
Changed: branch: master-3.2
Repository: wireshark

Commits:

8df9cfb by João Valverde (joao.valverde@xxxxxxxxxxxxxxxxxx):

    CMake: Fix FindGLIB2 for saner output
    
    Apparently FindPackageHandleStandardArgs uses if(DEFINED ...) to test
    VERSION_VAR, for somewhat obscure reasons. If we didn't find a suitable
    GLib package we must not define GLIB2_VERSION, otherwise the status
    output is confused and just generally wrong.
    
    Change-Id: Iad4012e69a7c641c50d1e399bbfdb51583cb3b40
    Reviewed-on: https://code.wireshark.org/review/36990
    Reviewed-by: João Valverde <j@xxxxxx>
    Petri-Dish: João Valverde <j@xxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    (cherry picked from commit 3a32757313e85368e88fdd9dbb82f839514569f5)
    Reviewed-on: https://code.wireshark.org/review/37017
    

Actions performed:

    from  495f17e   mpeg: make sure the presence flags are set.
     add  8df9cfb   CMake: Fix FindGLIB2 for saner output


Summary of changes:
 cmake/modules/FindGLIB2.cmake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)