Skip to content

O
opencv
Commit a1cc9380 authored by Mansour Moufid's avatar Mansour Moufid
Browse files
Options

Correct the new find_library commands. 

Thanks to SpecLad.
parent ab40630f
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 12 deletions
cmake/OpenCVFindLibsVideo.cmake
View file @ a1cc9380
...@@ -229,18 +229,10 @@ if(WITH_FFMPEG) ...@@ -229,18 +229,10 @@ if(WITH_FFMPEG)
if(FFMPEG_INCLUDE_DIR) if(FFMPEG_INCLUDE_DIR)
set(HAVE_GENTOO_FFMPEG TRUE) set(HAVE_GENTOO_FFMPEG TRUE)
set(FFMPEG_LIB_DIR "${FFMPEG_INCLUDE_DIR}/../lib" CACHE PATH "Full path of FFMPEG library directory") set(FFMPEG_LIB_DIR "${FFMPEG_INCLUDE_DIR}/../lib" CACHE PATH "Full path of FFMPEG library directory")
find_library(FFMPEG_CODEC_LIB find_library(FFMPEG_CODEC_LIB "avcodec" HINTS "${FFMPEG_LIB_DIR}")
NAMES "libavcodec.a" "libavcodec.dylib" find_library(FFMPEG_FORMAT_LIB "avformat" HINTS "${FFMPEG_LIB_DIR}")
PATHS "${FFMPEG_LIB_DIR}") find_library(FFMPEG_UTIL_LIB "avutil" HINTS "${FFMPEG_LIB_DIR}")
find_library(FFMPEG_FORMAT_LIB find_library(FFMPEG_SWSCALE_LIB "swscale" HINTS "${FFMPEG_LIB_DIR}")
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}")
if(FFMPEG_CODEC_LIB AND FFMPEG_FORMAT_LIB AND if(FFMPEG_CODEC_LIB AND FFMPEG_FORMAT_LIB AND
FFMPEG_UTIL_LIB AND FFMPEG_SWSCALE_LIB) FFMPEG_UTIL_LIB AND FFMPEG_SWSCALE_LIB)
set(HAVE_FFMPEG 1) set(HAVE_FFMPEG 1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment