From e22a2678da8e2085d5a6216b73d920aa488babd6 Mon Sep 17 00:00:00 2001 From: selim mustafaev Date: Mon, 20 Nov 2017 01:47:39 +0300 Subject: [PATCH] fixed problem with finding ffmpeg on linux and macos --- cmake/modules/FindFFMPEG.cmake | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/cmake/modules/FindFFMPEG.cmake b/cmake/modules/FindFFMPEG.cmake index 94f6fd1..213ad5e 100644 --- a/cmake/modules/FindFFMPEG.cmake +++ b/cmake/modules/FindFFMPEG.cmake @@ -119,29 +119,7 @@ find_path(FFMPEG_INCLUDE_DIR6 swresample.h ) if(FFMPEG_INCLUDE_DIR1) - if(FFMPEG_INCLUDE_DIR2) - if(FFMPEG_INCLUDE_DIR3) - set(FFMPEG_INCLUDE_DIR ${FFMPEG_INCLUDE_DIR1} - ${FFMPEG_INCLUDE_DIR2} - ${FFMPEG_INCLUDE_DIR3}) - endif() - endif() -endif() - -if(FFMPEG_INCLUDE_DIR4) - set(FFMPEG_INCLUDE_DIR ${FFMPEG_INCLUDE_DIR} - ${FFMPEG_INCLUDE_DIR4}) -endif() - -if(FFMPEG_INCLUDE_DIR5) - set(FFMPEG_INCLUDE_DIR ${FFMPEG_INCLUDE_DIR} - ${FFMPEG_INCLUDE_DIR5} - ${FFMPEG_INCLUDE_DIR5}/..) -endif() - -if(FFMPEG_INCLUDE_DIR6) - set(FFMPEG_INCLUDE_DIR ${FFMPEG_INCLUDE_DIR} - ${FFMPEG_INCLUDE_DIR6}) + set(FFMPEG_INCLUDE_DIR ${FFMPEG_INCLUDE_DIR1}) endif() find_library(FFMPEG_avformat_LIBRARY avformat @@ -292,4 +270,4 @@ endif() if(COMMAND set_package_properties) set_package_properties(FFMPEG PROPERTIES DESCRIPTION "A complete, cross-platform solution to record, convert and stream audio and video") set_package_properties(FFMPEG PROPERTIES URL "http://ffmpeg.org/") -endif() \ No newline at end of file +endif()