From ff1ac4f08b614304bf0baf985723ebc5d60c45e2 Mon Sep 17 00:00:00 2001 From: Tom Dewey Date: Wed, 31 Jul 2024 13:39:31 +0100 Subject: [PATCH] cmake: Windows: Drop openSSL linkage, add Bcrypt. --- src/CMakeLists.txt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index deb9668..154f68d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -186,7 +186,7 @@ elseif (WIN32) windows/winwlancredentials.cpp ) set(DEPENDENCIES windows/rpi-imager.rc wlanapi_delayed.lib) - set(EXTRALIBS setupapi ${CMAKE_CURRENT_BINARY_DIR}/wlanapi_delayed.lib) + set(EXTRALIBS setupapi ${CMAKE_CURRENT_BINARY_DIR}/wlanapi_delayed.lib Bcrypt.dll) add_custom_command( OUTPUT wlanapi_delayed.lib COMMAND ${CMAKE_DLLTOOL} --input-def "${CMAKE_CURRENT_SOURCE_DIR}/windows/wlanapi.def" @@ -340,12 +340,6 @@ if (WIN32) "${CMAKE_SOURCE_DIR}/../license.txt" "${CMAKE_SOURCE_DIR}/windows/rpi-imager-cli.cmd" "${CMAKE_BINARY_DIR}/deploy") - add_custom_command(TARGET ${PROJECT_NAME} - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy - "${${QT}_DIR}/../../../bin/libssl-1_1.dll" "${${QT}_DIR}/../../../bin/libcrypto-1_1.dll" - "${CMAKE_BINARY_DIR}/deploy") - configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/windows/rpi-imager.nsi.in" "${CMAKE_CURRENT_BINARY_DIR}/rpi-imager.nsi"