From af2c9de2e914d34e4f113e38f39e7a33c276f4fb Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 2 Jun 2025 21:03:05 +1200 Subject: [PATCH] 'Generic Commit' --- dropshell-tool/CMakeLists.txt | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dropshell-tool/CMakeLists.txt b/dropshell-tool/CMakeLists.txt index adce579..3ef33db 100644 --- a/dropshell-tool/CMakeLists.txt +++ b/dropshell-tool/CMakeLists.txt @@ -17,6 +17,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE OFF) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static") set(ZLIB_USE_STATIC_LIBS "ON") +set(OPENSSL_USE_STATIC_LIBS ON) set(CMAKE_CXX_STANDARD 23) set(CMAKE_C_STANDARD 23) @@ -94,10 +95,21 @@ target_link_libraries(${PROJECT_EXE_NAME} PRIVATE libassert::assert cpptrace::cpptrace nlohmann_json::nlohmann_json - OpenSSL::SSL - OpenSSL::Crypto ) +# Find OpenSSL (will use -DOPENSSL_ROOT_DIR etc. if set) +find_package(OpenSSL REQUIRED) + +# Link OpenSSL imported targets if found +if(TARGET OpenSSL::SSL AND TARGET OpenSSL::Crypto) + target_link_libraries(${PROJECT_EXE_NAME} PRIVATE + OpenSSL::SSL + OpenSSL::Crypto + ) +else() + message(FATAL_ERROR "OpenSSL targets not found. Set OPENSSL_ROOT_DIR and try again.") +endif() + # Set static linking flags set_target_properties(${PROJECT_EXE_NAME} PROPERTIES LINK_FLAGS "-static"