Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-31 19:31:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1436 from daleglass/require-openssl1.1

Browse source 
Require OpenSSL 1.1.0 in CMake.
This commit is contained in:
Dale Glass 2021-11-06 19:39:35 +01:00 committed by GitHub
commit a95b4f48cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/macros/TargetOpenSSL.cmake
View file

@ -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) set(OPENSSL_LIBRARIES "${OPENSSL_INSTALL_DIR}/lib/libcrypto.a;${OPENSSL_INSTALL_DIR}/lib/libssl.a" CACHE STRING INTERNAL)
else() else()
# using VCPKG for OpenSSL # using VCPKG for OpenSSL
find_package(OpenSSL REQUIRED) find_package(OpenSSL 1.1.0 REQUIRED)
endif() endif()
include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")

2
ice-server/CMakeLists.txt
View file

@ -8,7 +8,7 @@ link_hifi_libraries(embedded-webserver networking shared)
package_libraries_for_deployment() package_libraries_for_deployment()
# find OpenSSL # find OpenSSL
find_package(OpenSSL REQUIRED) find_package(OpenSSL 1.1.0 REQUIRED)
if (APPLE AND ${OPENSSL_INCLUDE_DIR} STREQUAL "/usr/include") if (APPLE AND ${OPENSSL_INCLUDE_DIR} STREQUAL "/usr/include")
# this is a user on OS X using system OpenSSL, which is going to throw warnings since they're deprecating for their common crypto # this is a user on OS X using system OpenSSL, which is going to throw warnings since they're deprecating for their common crypto

4
launchers/qt/CMakeLists.txt
View file

@ -69,7 +69,7 @@ if (WIN32)
set(OPENSSL_ROOT_DIR ${SSL_DIR}) set(OPENSSL_ROOT_DIR ${SSL_DIR})
message("SSL dir is ${SSL_DIR}") message("SSL dir is ${SSL_DIR}")
set(OPENSSL_USE_STATIC_LIBS TRUE) set(OPENSSL_USE_STATIC_LIBS TRUE)
find_package(OpenSSL REQUIRED) find_package(OpenSSL 1.1.0 REQUIRED)
message("-- Found OpenSSL Libs ${OPENSSL_LIBRARIES}") message("-- Found OpenSSL Libs ${OPENSSL_LIBRARIES}")
@ -105,7 +105,7 @@ endif()
if (APPLE) if (APPLE)
set(OPENSSL_USE_STATIC_LIBS TRUE) set(OPENSSL_USE_STATIC_LIBS TRUE)
find_package(OpenSSL REQUIRED) find_package(OpenSSL 1.1.0 REQUIRED)
endif() endif()
find_package(Qt5 COMPONENTS Core Gui Qml Quick QuickControls2 Network REQUIRED) find_package(Qt5 COMPONENTS Core Gui Qml Quick QuickControls2 Network REQUIRED)