From a9f85e95740962e17123751206b40d74dade6b5b Mon Sep 17 00:00:00 2001 From: Iwan Timmer Date: Sat, 4 Aug 2018 17:04:21 +0200 Subject: [PATCH] Revert "FindAmlogic: don't depend on amadec and amavutils" This reverts commit f7fadbd9cc6f3c7265a6c497cbd74fb7f7b7f574. On some systems libamcodec.so depends on libamadec.so or libamavutils.so --- cmake/FindAmlogic.cmake | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/cmake/FindAmlogic.cmake b/cmake/FindAmlogic.cmake index fddb5d0..82a8fe9 100755 --- a/cmake/FindAmlogic.cmake +++ b/cmake/FindAmlogic.cmake @@ -4,6 +4,18 @@ find_path(AMLOGIC_INCLUDE_DIR PATHS /usr/local/include/amcodec /usr/include/amcodec /usr/include/) mark_as_advanced(AMLOGIC_INCLUDE_DIR) +find_library(AMAVUTILS_LIBRARY + NAMES libamavutils.so + DOC "Path to Amlogic Audio Video Utils Library" + PATHS /usr/lib/aml_libs /usr/local/lib /usr/lib) +mark_as_advanced(AMAVUTILS_LIBRARY) + +find_library(AMADEC_LIBRARY + NAMES libamadec.so + DOC "Path to Amlogic Audio Decoder Library" + PATHS /usr/lib/aml_libs /usr/local/lib /usr/lib) +mark_as_advanced(AMADEC_LIBRARY) + find_library(AMCODEC_LIBRARY NAMES libamcodec.so DOC "Path to Amlogic Video Codec Library" @@ -11,7 +23,7 @@ find_library(AMCODEC_LIBRARY mark_as_advanced(AMCODEC_LIBRARY) include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Amlogic DEFAULT_MSG AMLOGIC_INCLUDE_DIR AMCODEC_LIBRARY) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Amlogic DEFAULT_MSG AMLOGIC_INCLUDE_DIR AMCODEC_LIBRARY AMADEC_LIBRARY AMAVUTILS_LIBRARY) -set(AMLOGIC_LIBRARIES ${AMCODEC_LIBRARY}) +set(AMLOGIC_LIBRARIES ${AMCODEC_LIBRARY} ${AMADEC_LIBRARY} ${AMAVUTILS_LIBRARY}) set(AMLOGIC_INCLUDE_DIRS ${AMLOGIC_INCLUDE_DIR})