diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-12-08 09:41:47 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2016-12-13 01:52:16 +0000 |
| commit | dd816a121829f8129dc70b70c25d83eed08e279a (patch) | |
| tree | d8ac9ee62d6fd7fd407eda610a7a07e936a3cb90 /cmake/modules/FindWinSparkle.cmake | |
| parent | ce54bfe055a8f1f674f0fe19fa0236e89744cddd (diff) | |
| download | wireshark-dd816a121829f8129dc70b70c25d83eed08e279a.tar.gz | |
Update to WinSparkle 0.5.3.
Update our WinSparkle package to 0.5.3. This fixes a file deletion bug.
Note that WinSparkle now supports application shutdown callbacks, which
should let us fix bugs 9687 and 12989.
Bug: 13217
Change-Id: I4b5f325c6dc251ce167f7bd344bbf3ca5ad3fe14
Reviewed-on: https://code.wireshark.org/review/19230
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'cmake/modules/FindWinSparkle.cmake')
| -rw-r--r-- | cmake/modules/FindWinSparkle.cmake | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/cmake/modules/FindWinSparkle.cmake b/cmake/modules/FindWinSparkle.cmake index 54c01d8903..6395102055 100644 --- a/cmake/modules/FindWinSparkle.cmake +++ b/cmake/modules/FindWinSparkle.cmake @@ -17,9 +17,15 @@ ENDIF (WINSPARKLE_INCLUDE_DIRS) INCLUDE(FindWSWinLibs) FindWSWinLibs("WinSparkle.*" "WINSPARKLE_HINTS") -FIND_PATH(WINSPARKLE_INCLUDE_DIR winsparkle.h HINTS "${WINSPARKLE_HINTS}" ) +# The 64-bit wpcap.lib is under /x64/Release +set ( _RELEASE_SUBDIR "Release" ) +if( WIN32 AND "${WIRESHARK_TARGET_PLATFORM}" STREQUAL "win64" ) + set ( _RELEASE_SUBDIR "x64/Release" ) +endif() -FIND_LIBRARY(WINSPARKLE_LIBRARY NAMES WinSparkle HINTS "${WINSPARKLE_HINTS}" ) +FIND_PATH(WINSPARKLE_INCLUDE_DIR winsparkle.h HINTS "${WINSPARKLE_HINTS}/include" ) + +FIND_LIBRARY(WINSPARKLE_LIBRARY NAMES WinSparkle HINTS "${WINSPARKLE_HINTS}/${_RELEASE_SUBDIR}" ) # handle the QUIETLY and REQUIRED arguments and set WINSPARKLE_FOUND to TRUE if # all listed variables are TRUE @@ -30,7 +36,7 @@ IF(WINSPARKLE_FOUND) SET(WINSPARKLE_LIBRARIES ${WINSPARKLE_LIBRARY} ) SET(WINSPARKLE_INCLUDE_DIRS ${WINSPARKLE_INCLUDE_DIR} ) if (WIN32) - set ( WINSPARKLE_DLL_DIR "${WINSPARKLE_HINTS}" + set ( WINSPARKLE_DLL_DIR "${WINSPARKLE_HINTS}/${_RELEASE_SUBDIR}" CACHE PATH "Path to the WinSparkle DLL" ) file( GLOB _winsparkle_dll RELATIVE "${WINSPARKLE_DLL_DIR}" |