From 88c8ce2808bbd3d42087f2d1f43a885a09f7fbbe Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 14 Jun 2025 22:11:46 +1200 Subject: [PATCH] 'Generic Commit' --- tests/ipdemo/CMakeLists.txt | 40 +++++++++++-------------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/tests/ipdemo/CMakeLists.txt b/tests/ipdemo/CMakeLists.txt index 2a8db47..a92b872 100644 --- a/tests/ipdemo/CMakeLists.txt +++ b/tests/ipdemo/CMakeLists.txt @@ -34,35 +34,19 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src/autogen src) -# Helper function to create OpenSSL targets for cross-compilation -function(ensure_openssl_targets) - if(NOT TARGET OpenSSL::SSL) - find_library(OPENSSL_SSL_LIB NAMES ssl - PATHS /usr/local/lib /usr/local/lib64 - NO_DEFAULT_PATH) - find_library(OPENSSL_CRYPTO_LIB NAMES crypto - PATHS /usr/local/lib /usr/local/lib64 - NO_DEFAULT_PATH) - - if(NOT OPENSSL_SSL_LIB OR NOT OPENSSL_CRYPTO_LIB) - message(FATAL_ERROR "OpenSSL libraries not found") - endif() - - add_library(OpenSSL::Crypto STATIC IMPORTED) - set_target_properties(OpenSSL::Crypto PROPERTIES - IMPORTED_LOCATION ${OPENSSL_CRYPTO_LIB} - INTERFACE_INCLUDE_DIRECTORIES /usr/local/include) - - add_library(OpenSSL::SSL STATIC IMPORTED) - set_target_properties(OpenSSL::SSL PROPERTIES - IMPORTED_LOCATION ${OPENSSL_SSL_LIB} - INTERFACE_INCLUDE_DIRECTORIES /usr/local/include - INTERFACE_LINK_LIBRARIES OpenSSL::Crypto) - endif() -endfunction() +# Find packages - handle OpenSSL for cross-compilation +if(NOT TARGET OpenSSL::SSL) + find_library(SSL_LIB ssl PATHS /usr/local/lib NO_DEFAULT_PATH REQUIRED) + find_library(CRYPTO_LIB crypto PATHS /usr/local/lib NO_DEFAULT_PATH REQUIRED) + + add_library(OpenSSL::Crypto STATIC IMPORTED) + set_property(TARGET OpenSSL::Crypto PROPERTY IMPORTED_LOCATION ${CRYPTO_LIB}) + + add_library(OpenSSL::SSL STATIC IMPORTED) + set_property(TARGET OpenSSL::SSL PROPERTY IMPORTED_LOCATION ${SSL_LIB}) + target_link_libraries(OpenSSL::SSL INTERFACE OpenSSL::Crypto) +endif() -# Find packages -ensure_openssl_targets() find_package(Drogon CONFIG REQUIRED) find_package(nlohmann_json REQUIRED)