From b5c7093477fa71fee01b5ab2e76a1624f2af3d41 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Tue, 27 Jan 2015 21:46:57 +0100 Subject: [PATCH 1/2] Fixed OpenSSL version regex Starting with OpenSSL 1.0.2 source code is reformatted. This patch takes care of the differences in the define spacing. --- cmake/FindOpenSSL.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/FindOpenSSL.cmake b/cmake/FindOpenSSL.cmake index 348d52729..e7ad8bfcf 100644 --- a/cmake/FindOpenSSL.cmake +++ b/cmake/FindOpenSSL.cmake @@ -268,7 +268,7 @@ if (OPENSSL_INCLUDE_DIR) set(OPENSSL_VERSION "${_OPENSSL_VERSION}") elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h") file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str - REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") + REGEX "^#.?define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") # 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. From 6229d6218eec4d6f8b5a01d72ad7865e970b7647 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Tue, 27 Jan 2015 21:05:51 +0100 Subject: [PATCH 2/2] Added additional search path suffix for OpenH264. --- cmake/FindOpenH264.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/FindOpenH264.cmake b/cmake/FindOpenH264.cmake index c5dfade59..01eabbb6f 100644 --- a/cmake/FindOpenH264.cmake +++ b/cmake/FindOpenH264.cmake @@ -11,8 +11,12 @@ if (OPENH264_INCLUDE_DIR AND OPENH264_LIBRARY) set(OPENH264_FIND_QUIETLY TRUE) endif (OPENH264_INCLUDE_DIR AND OPENH264_LIBRARY) -find_path(OPENH264_INCLUDE_DIR NAMES wels/codec_api.h wels/codec_app_def.h wels/codec_def.h HINTS ${OPENH264_ROOT}) -find_library(OPENH264_LIBRARY NAMES openh264 welsdec PATH_SUFFIXES lib HINTS ${OPENH264_ROOT}) +find_path(OPENH264_INCLUDE_DIR NAMES wels/codec_api.h wels/codec_app_def.h wels/codec_def.h + PATH_SUFFIXES include + HINTS ${OPENH264_ROOT}) +find_library(OPENH264_LIBRARY NAMES openh264 welsdec + PATH_SUFFIXES lib + HINTS ${OPENH264_ROOT}) include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenH264 DEFAULT_MSG OPENH264_LIBRARY OPENH264_INCLUDE_DIR)