From 4c994b81cb84103fab17c3a071b8aba29cc3229d Mon Sep 17 00:00:00 2001 From: Hizenberg Date: Sun, 12 May 2024 10:17:52 +0530 Subject: [PATCH] update --- CMakeLists.txt | 22 +++++++++++++--------- external/openssl | 1 - 2 files changed, 13 insertions(+), 10 deletions(-) delete mode 160000 external/openssl diff --git a/CMakeLists.txt b/CMakeLists.txt index d5b91d8..9d5e6a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,17 +109,21 @@ if (NOT EXISTS "${OPENSSL_PATH}/CMakeLists.txt") endif() - -set(OPENSSL_USE_STATIC_LIBS TRUE) -find_package(OpenSSL PATHS ${OPENSSL_PATH}) +find_package(OpenSSL) if( OPENSSL_FOUND ) - message(STATUS "OpenSSL found: ${OPENSSL_INCLUDE_DIR}") - message(STATUS "OpenSSL found: ${OPENSSL_CRYPTO_LIBRARY}") - message(STATUS "OpenSSL found: ${OPENSSL_SSL_LIBRARY}") - message(STATUS "OpenSSL found: ${OPENSSL_LIBRARIES}") -else() - message(FATAL_ERROR "OpenSSL not found") + set(OPENSSL_USE_STATIC_LIBS TRUE) + find_package(OpenSSL PATHS "${OPENSSL_PATH}/build") + + if( OPENSSL_FOUND ) + message(STATUS "OpenSSL found: ${OPENSSL_INCLUDE_DIR}") + message(STATUS "OpenSSL found: ${OPENSSL_CRYPTO_LIBRARY}") + message(STATUS "OpenSSL found: ${OPENSSL_SSL_LIBRARY}") + message(STATUS "OpenSSL found: ${OPENSSL_LIBRARIES}") + else() + message(FATAL_ERROR "OpenSSL not found") + endif() + endif() set(OPENSSL_LIB diff --git a/external/openssl b/external/openssl deleted file mode 160000 index 87314d2..0000000 --- a/external/openssl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 87314d24c4f025df1ebf47dc527cc8a96bef354a