From 732b32b68ee6e452ee92b7853c7cd0708dc4be2c Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Thu, 4 Nov 2021 18:54:35 +0100 Subject: [PATCH] Require OpenSSL 1.1.0 in all other parts of the build --- cmake/macros/TargetOpenSSL.cmake | 2 +- launchers/qt/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/macros/TargetOpenSSL.cmake b/cmake/macros/TargetOpenSSL.cmake index f74015201d..faf5116a25 100644 --- a/cmake/macros/TargetOpenSSL.cmake +++ b/cmake/macros/TargetOpenSSL.cmake @@ -12,7 +12,7 @@ macro(TARGET_OPENSSL) set(OPENSSL_LIBRARIES "${OPENSSL_INSTALL_DIR}/lib/libcrypto.a;${OPENSSL_INSTALL_DIR}/lib/libssl.a" CACHE STRING INTERNAL) else() # using VCPKG for OpenSSL - find_package(OpenSSL REQUIRED) + find_package(OpenSSL 1.1.0 REQUIRED) endif() include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") diff --git a/launchers/qt/CMakeLists.txt b/launchers/qt/CMakeLists.txt index 400615be90..a472c670bb 100644 --- a/launchers/qt/CMakeLists.txt +++ b/launchers/qt/CMakeLists.txt @@ -69,7 +69,7 @@ if (WIN32) set(OPENSSL_ROOT_DIR ${SSL_DIR}) message("SSL dir is ${SSL_DIR}") set(OPENSSL_USE_STATIC_LIBS TRUE) - find_package(OpenSSL REQUIRED) + find_package(OpenSSL 1.1.0 REQUIRED) message("-- Found OpenSSL Libs ${OPENSSL_LIBRARIES}") @@ -105,7 +105,7 @@ endif() if (APPLE) set(OPENSSL_USE_STATIC_LIBS TRUE) - find_package(OpenSSL REQUIRED) + find_package(OpenSSL 1.1.0 REQUIRED) endif() find_package(Qt5 COMPONENTS Core Gui Qml Quick QuickControls2 Network REQUIRED)