URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0b2675b8e8da8aa9db3856e3f0bf822fc92536e9
Submitter: "Gerald Combs <gerald@xxxxxxxxxxxxx>"
Changed: branch: master-3.2
Repository: wireshark
Commits:
0b2675b 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>
(cherry picked from commit acaba5ee7ea04c64d20f974909a0bada5c0caedb)
Reviewed-on: https://code.wireshark.org/review/36083
Actions performed:
from 5e7d3df [Automatic update for 2020-02-09]
add 0b2675b CMake: Fix WinSparkle discovery.
Summary of changes:
cmake/modules/FindWinSparkle.cmake | 2 +-
docbook/release-notes.adoc | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)