From 8cdf8dec703d882b46ca50a769fabb95ffc48e2c Mon Sep 17 00:00:00 2001 From: manuel Date: Thu, 24 Nov 2016 21:27:41 +0100 Subject: sync with upstream --- project/cmake/modules/FindCEC.cmake | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'project/cmake/modules/FindCEC.cmake') diff --git a/project/cmake/modules/FindCEC.cmake b/project/cmake/modules/FindCEC.cmake index 98e900d..bd6fd1d 100644 --- a/project/cmake/modules/FindCEC.cmake +++ b/project/cmake/modules/FindCEC.cmake @@ -15,13 +15,23 @@ # CEC::CEC - The libCEC library if(PKG_CONFIG_FOUND) - pkg_check_modules(PC_CEC libCEC>=3.0.0 QUIET) + pkg_check_modules(PC_CEC libcec QUIET) endif() -find_path(CEC_INCLUDE_DIR libCEC/CEC.h +find_path(CEC_INCLUDE_DIR NAMES libcec/cec.h libCEC/CEC.h PATHS ${PC_CEC_INCLUDEDIR}) -set(CEC_VERSION ${PC_CEC_VERSION}) +if(PC_CEC_VERSION) + set(CEC_VERSION ${PC_CEC_VERSION}) +elseif(CEC_INCLUDE_DIR AND EXISTS "${CEC_INCLUDE_DIR}/libcec/version.h") + file(STRINGS "${CEC_INCLUDE_DIR}/libcec/version.h" cec_version_str REGEX "^[\t ]+LIBCEC_VERSION_TO_UINT\\(.*\\)") + string(REGEX REPLACE "^[\t ]+LIBCEC_VERSION_TO_UINT\\(([0-9]+), ([0-9]+), ([0-9]+)\\)" "\\1.\\2.\\3" CEC_VERSION "${cec_version_str}") + unset(cec_version_str) +endif() + +if(NOT CEC_FIND_VERSION) + set(CEC_FIND_VERSION 4.0.0) +endif() include(FindPackageHandleStandardArgs) if(NOT WIN32) -- cgit v1.2.3