mirror of
https://github.com/liudf0716/apfree_wifidog.git
synced 2025-01-08 11:57:37 +08:00
support openssl > 3.0
This commit is contained in:
parent
e208eeb6c7
commit
53a0428360
@ -282,11 +282,11 @@ function(from_hex HEX DEC)
|
|||||||
set(${DEC} ${_res} PARENT_SCOPE)
|
set(${DEC} ${_res} PARENT_SCOPE)
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
if (OPENSSL_INCLUDE_DIR)
|
if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
|
||||||
if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
|
file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
|
||||||
file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
|
REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
|
||||||
REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
|
|
||||||
|
|
||||||
|
if(openssl_version_str)
|
||||||
# The version number is encoded as 0xMNNFFPPS: major minor fix patch status
|
# The version number is encoded as 0xMNNFFPPS: major minor fix patch status
|
||||||
# The status gives if this is a developer or prerelease and is ignored here.
|
# The status gives if this is a developer or prerelease and is ignored here.
|
||||||
# Major, minor, and fix directly translate into the version numbers shown in
|
# Major, minor, and fix directly translate into the version numbers shown in
|
||||||
@ -315,6 +315,25 @@ if (OPENSSL_INCLUDE_DIR)
|
|||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
set(OPENSSL_VERSION "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH_STRING}")
|
set(OPENSSL_VERSION "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH_STRING}")
|
||||||
|
else ()
|
||||||
|
# Since OpenSSL 3.0.0, the new version format is MAJOR.MINOR.PATCH and
|
||||||
|
# a new OPENSSL_VERSION_STR macro contains exactly that
|
||||||
|
file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" OPENSSL_VERSION_STR
|
||||||
|
REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_STR[\t ]+\"([0-9])+\\.([0-9])+\\.([0-9])+\".*")
|
||||||
|
string(REGEX REPLACE "^.*OPENSSL_VERSION_STR[\t ]+\"([0-9]+\\.[0-9]+\\.[0-9]+)\".*$"
|
||||||
|
"\\1" OPENSSL_VERSION_STR "${OPENSSL_VERSION_STR}")
|
||||||
|
|
||||||
|
set(OPENSSL_VERSION "${OPENSSL_VERSION_STR}")
|
||||||
|
|
||||||
|
# Setting OPENSSL_VERSION_MAJOR OPENSSL_VERSION_MINOR and OPENSSL_VERSION_FIX
|
||||||
|
string(REGEX MATCHALL "([0-9])+" OPENSSL_VERSION_NUMBER "${OPENSSL_VERSION}")
|
||||||
|
list(POP_FRONT OPENSSL_VERSION_NUMBER
|
||||||
|
OPENSSL_VERSION_MAJOR
|
||||||
|
OPENSSL_VERSION_MINOR
|
||||||
|
OPENSSL_VERSION_FIX)
|
||||||
|
|
||||||
|
unset(OPENSSL_VERSION_NUMBER)
|
||||||
|
unset(OPENSSL_VERSION_STR)
|
||||||
endif ()
|
endif ()
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user