Skip to content

Commit 0492bf1

Browse files
authored
Merge pull request aws#2 from hjmallon/_hm_fix_centos9
Fix OpenSSL Crypto hunter-build and linking on Linux
2 parents 5825fcb + da65b7e commit 0492bf1

File tree

3 files changed

+27
-2
lines changed

3 files changed

+27
-2
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ set(CMAKE_CXX_RESPONSE_FILE_LINK_FLAG "@")
131131

132132
include("cmake/HunterGate.cmake")
133133
HunterGate(
134-
URL "https://github.com/cpp-pm/hunter/archive/v0.23.314.tar.gz"
135-
SHA1 "95c47c92f68edb091b5d6d18924baabe02a6962a"
134+
URL "https://github.com/cpp-pm/hunter/archive/v0.24.7.tar.gz"
135+
SHA1 "908ddcb223f25fa155315baae64ce0ab48a38bf7"
136136
)
137137

138138
if(COMMAND apply_pre_project_platform_settings)

cmake/Findcrypto.cmake

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,28 @@ if (TARGET crypto OR TARGET AWS::crypto)
3030
message(STATUS "crypto Include Dir: ${crypto_INCLUDE_DIR}")
3131
set(CRYPTO_FOUND true)
3232
set(crypto_FOUND true)
33+
34+
elseif(TARGET OpenSSL::Crypto)
35+
set(CRYPTO_FOUND true)
36+
set(crypto_FOUND true)
37+
38+
get_target_property(crypto_INCLUDE_DIR OpenSSL::Crypto INTERFACE_INCLUDE_DIRECTORIES)
39+
get_target_property(crypto_LIBRARY OpenSSL::Crypto IMPORTED_LOCATION)
40+
41+
message(STATUS "LibCrypto from OpenSSL::Crypto")
42+
message(STATUS "LibCrypto Include Dir: ${crypto_INCLUDE_DIR}")
43+
message(STATUS "LibCrypto Lib: ${crypto_LIBRARY}")
44+
45+
set(THREADS_PREFER_PTHREAD_FLAG ON)
46+
find_package(Threads REQUIRED)
47+
add_library(AWS::crypto UNKNOWN IMPORTED)
48+
set_target_properties(AWS::crypto PROPERTIES
49+
INTERFACE_INCLUDE_DIRECTORIES "${crypto_INCLUDE_DIR}")
50+
set_target_properties(AWS::crypto PROPERTIES
51+
IMPORTED_LINK_INTERFACE_LANGUAGES "C"
52+
IMPORTED_LOCATION "${crypto_LIBRARY}")
53+
add_dependencies(AWS::crypto Threads::Threads)
54+
3355
else()
3456
find_path(crypto_INCLUDE_DIR
3557
NAMES openssl/crypto.h

cmake/external_dependencies.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ elseif(ENABLE_OPENSSL_ENCRYPTION)
3333
set(USE_OPENSSL ON)
3434
message(STATUS " Building Openssl as part of AWS SDK")
3535
else()
36+
hunter_add_package(OpenSSL)
37+
find_package(OpenSSL REQUIRED)
38+
3639
find_package(crypto REQUIRED)
3740
endif()
3841
set(CRYPTO_LIBS ${CRYPTO_TARGET_NAME} ${ZLIB_LIBRARIES})

0 commit comments

Comments
 (0)