Skip to content

Commit

Permalink
deps/openssl: bump version from 1.1.0f to 1.1.1c. (#601)
Browse files Browse the repository at this point in the history
* deps/openssl: bump version from 1.1.0f to 1.1.1c.

This should fix some (not all) macOS compilation issues from #439.

* deps/openssl: add Threads to openssl-crypto's target_link_libraries().
  • Loading branch information
PeterMatula committed Jul 3, 2019
1 parent d716565 commit 8781330
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions deps/openssl/CMakeLists.txt
Expand Up @@ -10,6 +10,7 @@ endif()
message(STATUS " --> OpenSSL will be built as an external project")

find_package(Perl REQUIRED)
find_package(Threads REQUIRED)

include(ExternalProject)
include(ProcessorCount)
Expand Down Expand Up @@ -124,9 +125,9 @@ endif()
set(OPENSSL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/openssl")
set(OPENSSL_SRC_DIR "${OPENSSL_PREFIX}/src/openssl")
set(OPENSSL_INSTALL_DIR "${OPENSSL_PREFIX}/src/openssl-install")
set(OPENSSL_VERSION "1.1.0f")
set(OPENSSL_VERSION "1.1.1c")
set(OPENSSL_URL "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz")
set(OPENSSL_ARCHIVE_SHA256 "12f746f3f2493b2f39da7ecf63d7ee19c6ac9ec6a4fcd8c229da8a522cb12765")
set(OPENSSL_ARCHIVE_SHA256 "f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90")
set(OPENSSL_DOWNLOAD_NAME "openssl.tar.gz")

set(OPENSSL_CONFIGURE_OPTIONS
Expand Down Expand Up @@ -173,6 +174,7 @@ set(OPENSSL_LIBRARIES
add_library(openssl-crypto INTERFACE)
target_include_directories(openssl-crypto SYSTEM INTERFACE "${OPENSSL_INSTALL_DIR}/include")
target_link_libraries(openssl-crypto INTERFACE "${OPENSSL_INSTALL_DIR}/lib/libcrypto${CMAKE_STATIC_LIBRARY_SUFFIX}")
target_link_libraries(openssl-crypto INTERFACE Threads::Threads)
if(MSVC)
target_link_libraries(openssl-crypto INTERFACE ws2_32 gdi32 advapi32 crypt32 user32)
endif()
Expand Down

0 comments on commit 8781330

Please sign in to comment.