mirror of
https://github.com/cmclark00/retro-imager.git
synced 2025-05-18 16:05:21 +01:00
Linux: allow using GnuTLS instead of OpenSSL for computing SHA256 hashes
Prevents issues with often changing OpenSSL ABI. Ref #429
This commit is contained in:
parent
8d943ce2bd
commit
cb415a6a02
5 changed files with 61 additions and 16 deletions
|
@ -32,7 +32,7 @@ if (APPLE)
|
|||
dependencies/drivelist/src/darwin/list.mm dependencies/drivelist/src/darwin/REDiskList.m icons/rpi-imager.icns)
|
||||
enable_language(OBJC C)
|
||||
elseif (UNIX)
|
||||
set(DEPENDENCIES acceleratedcryptographichash.cpp dependencies/mountutils/src/linux/functions.cpp linux/linuxdrivelist.cpp)
|
||||
set(DEPENDENCIES dependencies/mountutils/src/linux/functions.cpp linux/linuxdrivelist.cpp)
|
||||
find_package(Qt5DBus)
|
||||
if(Qt5DBus_FOUND)
|
||||
set(DEPENDENCIES ${DEPENDENCIES} linux/udisks2api.cpp linux/udisks2api.h)
|
||||
|
@ -49,6 +49,15 @@ elseif (UNIX)
|
|||
if(LIBLZMA_FOUND)
|
||||
set(EXTRALIBS ${EXTRALIBS} LibLZMA::LibLZMA)
|
||||
endif()
|
||||
find_package(GnuTLS)
|
||||
if (GnuTLS_FOUND)
|
||||
set(DEPENDENCIES ${DEPENDENCIES} acceleratedcryptographichash_gnutls.cpp)
|
||||
set(EXTRALIBS ${EXTRALIBS} GnuTLS::GnuTLS)
|
||||
add_definitions(-DHAVE_GNUTLS)
|
||||
else()
|
||||
find_package(OpenSSL REQUIRED)
|
||||
set(DEPENDENCIES ${DEPENDENCIES} acceleratedcryptographichash.cpp)
|
||||
endif()
|
||||
elseif (WIN32)
|
||||
set(DEPENDENCIES acceleratedcryptographichash.cpp dependencies/mountutils/src/windows/functions.cpp dependencies/drivelist/src/windows/list.cpp
|
||||
windows/winfile.cpp windows/winfile.h
|
||||
|
@ -272,7 +281,7 @@ elseif(APPLE)
|
|||
else()
|
||||
find_package(CURL 7.32.0 REQUIRED)
|
||||
find_package(LibArchive 3.2.0 REQUIRED)
|
||||
find_package(OpenSSL REQUIRED)
|
||||
|
||||
if (NOT CMAKE_CROSSCOMPILING)
|
||||
find_program(LSBLK "lsblk")
|
||||
if (NOT LSBLK)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue