diff options
| author | Gerald Combs <gerald@wireshark.org> | 2023-05-17 18:57:03 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2023-05-18 16:13:02 +0000 |
| commit | da01f878e11889d4a79c1a8b27f04c3652895519 (patch) | |
| tree | 2e3d0aa476dda227a10463e5ce685643b4928213 /cmake | |
| parent | 0a28e4e8aa8e5b1b804baa39c7878f88a80b581d (diff) | |
Windows: Upgrade WinSparkle to 0.8.0
Upgrade to an OpenSSL-less build of 0.8.0 and add Arm64 support.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindWinSparkle.cmake | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cmake/modules/FindWinSparkle.cmake b/cmake/modules/FindWinSparkle.cmake index db101ec571..7b2c90b338 100644 --- a/cmake/modules/FindWinSparkle.cmake +++ b/cmake/modules/FindWinSparkle.cmake @@ -17,15 +17,14 @@ ENDIF (WINSPARKLE_INCLUDE_DIRS) INCLUDE(FindWSWinLibs) FindWSWinLibs("WinSparkle.*" "WINSPARKLE_HINTS") -# The 64-bit WinSparkle.lib is under /x64/Release -set ( _RELEASE_SUBDIR "Release" ) -if( WIN32 AND "${WIRESHARK_TARGET_PLATFORM}" STREQUAL "win64" ) - set ( _RELEASE_SUBDIR "x64/Release" ) +set (_release_subdir "x64/Release") +if ("${WIRESHARK_TARGET_PLATFORM}" STREQUAL "win64arm") + set (_release_subdir "ARM64/Release") endif() FIND_PATH(WINSPARKLE_INCLUDE_DIR winsparkle.h HINTS "${WINSPARKLE_HINTS}/include" ) -FIND_LIBRARY(WINSPARKLE_LIBRARY NAMES WinSparkle HINTS "${WINSPARKLE_HINTS}/${_RELEASE_SUBDIR}" ) +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 @@ -36,7 +35,7 @@ IF(WINSPARKLE_FOUND) SET(WINSPARKLE_LIBRARIES ${WINSPARKLE_LIBRARY} ) SET(WINSPARKLE_INCLUDE_DIRS ${WINSPARKLE_INCLUDE_DIR} ) if (WIN32) - set ( WINSPARKLE_DLL_DIR "${WINSPARKLE_HINTS}/${_RELEASE_SUBDIR}" + set (WINSPARKLE_DLL_DIR "${WINSPARKLE_HINTS}/${_release_subdir}" CACHE PATH "Path to the WinSparkle DLL" ) file( GLOB _winsparkle_dll RELATIVE "${WINSPARKLE_DLL_DIR}" @@ -55,4 +54,6 @@ ELSE(WINSPARKLE_FOUND) SET(WINSPARKLE_DLL ) ENDIF(WINSPARKLE_FOUND) +unset(_release_subdir) + MARK_AS_ADVANCED( WINSPARKLE_LIBRARIES WINSPARKLE_INCLUDE_DIRS ) |