From a1cc9380e59ced52603690bd48ddf6e5656e3503 Mon Sep 17 00:00:00 2001 From: Mansour Moufid Date: Mon, 2 Feb 2015 11:54:09 -0500 Subject: [PATCH] Correct the new find_library commands. Thanks to SpecLad. --- cmake/OpenCVFindLibsVideo.cmake | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/cmake/OpenCVFindLibsVideo.cmake b/cmake/OpenCVFindLibsVideo.cmake index 7e5bcff560..9a712203f4 100644 --- a/cmake/OpenCVFindLibsVideo.cmake +++ b/cmake/OpenCVFindLibsVideo.cmake @@ -229,18 +229,10 @@ if(WITH_FFMPEG) if(FFMPEG_INCLUDE_DIR) set(HAVE_GENTOO_FFMPEG TRUE) set(FFMPEG_LIB_DIR "${FFMPEG_INCLUDE_DIR}/../lib" CACHE PATH "Full path of FFMPEG library directory") - find_library(FFMPEG_CODEC_LIB - NAMES "libavcodec.a" "libavcodec.dylib" - PATHS "${FFMPEG_LIB_DIR}") - find_library(FFMPEG_FORMAT_LIB - NAMES "libavformat.a" "libavformat.dylib" - PATHS "${FFMPEG_LIB_DIR}") - find_library(FFMPEG_UTIL_LIB - NAMES "libavutil.a" "libavutil.dylib" - PATHS "${FFMPEG_LIB_DIR}") - find_library(FFMPEG_SWSCALE_LIB - NAMES "libswscale.a" "libswscale.dylib" - PATHS "${FFMPEG_LIB_DIR}") + find_library(FFMPEG_CODEC_LIB "avcodec" HINTS "${FFMPEG_LIB_DIR}") + find_library(FFMPEG_FORMAT_LIB "avformat" HINTS "${FFMPEG_LIB_DIR}") + find_library(FFMPEG_UTIL_LIB "avutil" HINTS "${FFMPEG_LIB_DIR}") + find_library(FFMPEG_SWSCALE_LIB "swscale" HINTS "${FFMPEG_LIB_DIR}") if(FFMPEG_CODEC_LIB AND FFMPEG_FORMAT_LIB AND FFMPEG_UTIL_LIB AND FFMPEG_SWSCALE_LIB) set(HAVE_FFMPEG 1)