security-and-privacy/uts-server
security-and-privacy
/
uts-server
mirror of https://github.com/kakwa/uts-server
1
0
Fork 0
Code Issues Releases Wiki Activity

remove cmake warning + better comment

This commit is contained in:
kakwa 2017-04-21 08:59:20 +02:00
parent f01f72f913
commit 61b9f2819a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -60,7 +60,7 @@ find_package(LibreSSL)
MESSAGE(STATUS "LibreSSL Detected: ${IS_LIBRESSL}") MESSAGE(STATUS "LibreSSL Detected: ${IS_LIBRESSL}")
if(NOT(DEFINED OPENSSL_API_1_1)) if(NOT(DEFINED OPENSSL_API_1_1))
if(${OPENSSL_VERSION} VERSION_GREATER 1.0.99 AND NOT(${IS_LIBRESSL})) if(${OPENSSL_VERSION} VERSION_GREATER 1.0.99 AND NOT(IS_LIBRESSL))
set(OPENSSL_API_1_1 ON) set(OPENSSL_API_1_1 ON)
else() else()
set(OPENSSL_API_1_1 OFF) set(OPENSSL_API_1_1 OFF)

9
cmake/FindLibreSSL.cmake
View File

@ -2,7 +2,7 @@
# FindLibreSSL # FindLibreSSL
# ------------ # ------------
# #
# Detect if OpenSSL is in fact LibreSSL, and recovers libressl version. # Detect if OpenSSL is in fact LibreSSL, and recovers LibreSSL version.
# #
# Requires running FindOpenSSL previously # Requires running FindOpenSSL previously
# #
@ -13,9 +13,10 @@
# This is set to ``$major.$minor.$revision$patch`` (e.g. ``2.3.1f``). # This is set to ``$major.$minor.$revision$patch`` (e.g. ``2.3.1f``).
# #
# ``IS_LIBRESSL`` # ``IS_LIBRESSL``
# Boolean, set to true if LibreSSL # Boolean, set to TRUE if LibreSSL, FALSE otherwise
# #
# just copy/pasted from OpenSSL module with a few substitutions
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" libressl_version_str file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" libressl_version_str
REGEX "^#[\t ]*define[\t ]+LIBRESSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") REGEX "^#[\t ]*define[\t ]+LIBRESSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
@ -49,8 +50,8 @@ if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
endif () endif ()
set(LIBRESSL_VERSION "${LIBRESSL_VERSION_MAJOR}.${LIBRESSL_VERSION_MINOR}.${LIBRESSL_VERSION_FIX}${LIBRESSL_VERSION_PATCH_STRING}") set(LIBRESSL_VERSION "${LIBRESSL_VERSION_MAJOR}.${LIBRESSL_VERSION_MINOR}.${LIBRESSL_VERSION_FIX}${LIBRESSL_VERSION_PATCH_STRING}")
set(IS_LIBRESSL ON) set(IS_LIBRESSL TRUE)
else () else ()
set(IS_LIBRESSL OFF) set(IS_LIBRESSL FALSE)
endif () endif ()
endif () endif ()