blob: e09d9c7d1b88d94aa824571fac674069f6fda47e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
$NetBSD: patch-cmake_modules_FindFFmpeg.cmake,v 1.1 2014/08/11 23:21:11 wiz Exp $
Include ffmpeg1 pkgsrc paths in search path.
--- cmake/modules/FindFFmpeg.cmake.orig 2013-11-23 15:43:42.000000000 +0000
+++ cmake/modules/FindFFmpeg.cmake
@@ -28,6 +28,7 @@ MACRO(FFMPEG_FIND varname shortname head
FIND_PATH(FFMPEG_${varname}_INCLUDE_DIRS lib${shortname}/${headername}
PATHS
${FFMPEG_ROOT}/include
+ ${FFMPEG_ROOT}/include/ffmpeg1
$ENV{FFMPEG_DIR}/include
~/Library/Frameworks
/Library/Frameworks
@@ -43,7 +44,7 @@ MACRO(FFMPEG_FIND varname shortname head
DOC "Location of FFMPEG Headers"
)
FIND_PATH(FFMPEG_${varname}_INCLUDE_DIRS lib${shortname}/${headername}
- PATH_SUFFIXES ffmpeg
+ PATH_SUFFIXES ffmpeg ffmpeg1
DOC "Location of FFMPEG Headers"
)
@@ -51,6 +52,7 @@ MACRO(FFMPEG_FIND varname shortname head
NAMES ${shortname}
PATHS
${FFMPEG_ROOT}/lib
+ ${FFMPEG_ROOT}/lib/ffmpeg1
$ENV{FFMPEG_DIR}/lib
~/Library/Frameworks
/Library/Frameworks
|
