Wireshark-commits: [Wireshark-commits] master acaba5e: CMake: Fix WinSparkle discovery.
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: Wed, 12 Feb 2020 13:42:47 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=acaba5ee7ea04c64d20f974909a0bada5c0caedb
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

acaba5e by Gerald Combs (gerald@xxxxxxxxxxxxx):

    CMake: Fix WinSparkle discovery.
    
    g46b3753d53 changed "ws_find_package(WINSPARKLE ..." to
    "ws_find_package(WinSparkle ..." in CMakeLists.txt in order to
    fix an issue with case-sensitive folders.
    
    This exposed a different issue in FindWinSparkle.cmake, where we
    were passing "WINSPARKLE" to find_package_handle_standard_args. When
    successful this would set WINSPARKLE_FOUND, which would in turn *not*
    match WinSparkle_FOUND in ws_find_package, which means that we wouldn't
    enable automatic updates.
    
    Pass "WinSparkle" to find_package_handle_standard_args instead. Using
    a mixed-case package name results in setting both PackageName_FOUND and
    PACKAGENAME_FOUND, which fixes our various checks.
    
    Bug: 16381
    Change-Id: I46ef98194dc060ad37d9a30bff4d9e905713759e
    Reviewed-on: https://code.wireshark.org/review/36079
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  74c2bcb   Qt: Restore space and add tooltips
     add  acaba5e   CMake: Fix WinSparkle discovery.


Summary of changes:
 cmake/modules/FindWinSparkle.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)