Merge pull request #108 from cchampet/build_fix_pkg_config

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit b987e8b5bedd · 2014-10-11T02:15:59.000-07:00
Cmake FindFFmpeg: fix pkg config
diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake
@@ -49,13 +49,12 @@ macro(find_component COMPONENT PKGCONFIG LIBRARY HEADER)
 
 	find_path(${COMPONENT}_INCLUDE_DIR
 		${HEADER}
-		PATH ${PC_LIB${COMPONENT}_INCLUDEDIR} ${PC_LIB${COMPONENT}_INCLUDE_DIR}
-		PATH_SUFFIXES ffmpeg libav
+		HINTS ${PC_${COMPONENT}_INCLUDEDIR} ${PC_${COMPONENT}_INCLUDE_DIR}
 	)
 
 	find_library(${COMPONENT}_LIBRARIES 
 		NAMES ${LIBRARY}
-		PATH ${PC_LIB${COMPONENT}_LIBDIR} ${PC_LIB${COMPONENT}_LIBRARY_DIRS}
+		HINTS ${PC_${COMPONENT}_LIBDIR} ${PC_${COMPONENT}_LIBRARY_DIRS}
 	)
 
 	set(${COMPONENT}_DEFINITIONS ${PC_${COMPONENT}_CFLAGS_OTHER} CACHE STRING "The ${COMPONENT} CFLAGS.")	

Original file line number	Diff line number	Diff line change
`@@ -49,13 +49,12 @@ macro(find_component COMPONENT PKGCONFIG LIBRARY HEADER)`
`49`	`49`
`50`	`50`	`find_path(${COMPONENT}_INCLUDE_DIR`
`51`	`51`	`${HEADER}`
`52`		`- PATH ${PC_LIB${COMPONENT}_INCLUDEDIR} ${PC_LIB${COMPONENT}_INCLUDE_DIR}`
`53`		`- PATH_SUFFIXES ffmpeg libav`
	`52`	`+ HINTS ${PC_${COMPONENT}_INCLUDEDIR} ${PC_${COMPONENT}_INCLUDE_DIR}`
`54`	`53`	`)`
`55`	`54`
`56`	`55`	`find_library(${COMPONENT}_LIBRARIES`
`57`	`56`	`NAMES ${LIBRARY}`
`58`		`- PATH ${PC_LIB${COMPONENT}_LIBDIR} ${PC_LIB${COMPONENT}_LIBRARY_DIRS}`
	`57`	`+ HINTS ${PC_${COMPONENT}_LIBDIR} ${PC_${COMPONENT}_LIBRARY_DIRS}`
`59`	`58`	`)`
`60`	`59`
`61`	`60`	`set(${COMPONENT}_DEFINITIONS ${PC_${COMPONENT}_CFLAGS_OTHER} CACHE STRING "The ${COMPONENT} CFLAGS.")`