From 61b9f2819abd3c0442611bc05b63856656efbc14 Mon Sep 17 00:00:00 2001 From: kakwa Date: Fri, 21 Apr 2017 08:59:20 +0200 Subject: [PATCH] remove cmake warning + better comment --- CMakeLists.txt | 2 +- cmake/FindLibreSSL.cmake | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a0caa3..19f4e18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,7 +60,7 @@ find_package(LibreSSL) MESSAGE(STATUS "LibreSSL Detected: ${IS_LIBRESSL}") 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) else() set(OPENSSL_API_1_1 OFF) diff --git a/cmake/FindLibreSSL.cmake b/cmake/FindLibreSSL.cmake index 8e14799..ec3e2cc 100644 --- a/cmake/FindLibreSSL.cmake +++ b/cmake/FindLibreSSL.cmake @@ -2,7 +2,7 @@ # 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 # @@ -13,9 +13,10 @@ # This is set to ``$major.$minor.$revision$patch`` (e.g. ``2.3.1f``). # # ``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") file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" libressl_version_str 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 () 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 () - set(IS_LIBRESSL OFF) + set(IS_LIBRESSL FALSE) endif () endif ()