CMake: get swresample or avresample

Clement Champetier · Clement Champetier · commit a5c72f9832b9 · 2014-09-09T14:20:24.000+02:00
* Update FindFFmpeg.cmake : do not raise error if a component is not
found (warning).
diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake
@@ -36,13 +36,13 @@ endmacro()
 # then looking up the libraries and include directories.
 # @todo: WIN and MAC OSX.
 #
-macro(find_component COMPONENT PKGCONFIG PKGOPTION LIBRARY HEADER)
+macro(find_component COMPONENT PKGCONFIG LIBRARY HEADER)
 	if(NOT WIN32)
 		# use pkg-config to get the directories and then use these values
 		# in the FIND_PATH() and FIND_LIBRARY() calls
 		find_package(PkgConfig)
 		if(PKG_CONFIG_FOUND)
-			pkg_check_modules(PC_${COMPONENT} ${PKGCONFIG} ${PKGOPTION})
+			pkg_check_modules(PC_${COMPONENT} ${PKGCONFIG})
 		endif()
 	endif()
 
@@ -93,15 +93,15 @@ else()
 	foreach(COMPONENT ${FFmpeg_FIND_COMPONENTS})
 		# Get component name is lower cases.
 		string(TOLOWER ${COMPONENT} LOWERCOMPONENT)
-		find_component(${COMPONENT} lib${LOWERCOMPONENT} REQUIRED ${LOWERCOMPONENT} lib${LOWERCOMPONENT}/${LOWERCOMPONENT}.h)
+		find_component(${COMPONENT} lib${LOWERCOMPONENT} ${LOWERCOMPONENT} lib${LOWERCOMPONENT}/${LOWERCOMPONENT}.h)
 		# If the component is found.
 		if(${COMPONENT}_FOUND)
 			message(STATUS "Required component ${COMPONENT} present.")
 			set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${${COMPONENT}_LIBRARIES})
 			set(FFMPEG_DEFINITIONS ${FFMPEG_DEFINITIONS} ${${COMPONENT}_DEFINITIONS})
 			list(APPEND FFMPEG_INCLUDE_DIR ${${COMPONENT}_INCLUDE_DIR})
 		else()
-			message(SEND_ERROR "Required component ${COMPONENT} missing.")
+			message(STATUS "Required component ${COMPONENT} missing.")
 		endif()
 	endforeach()
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -4,7 +4,7 @@ include(AvTranscoderMacros)
 
 ##find_package(FFmpeg)
 find_package(FFmpeg
-	COMPONENTS REQUIRED avcodec avformat avutil swscale swresample)
+	COMPONENTS avcodec avformat avutil swscale swresample avresample)
 
 # get FFmpeg / libav libraries from path
 file(GLOB FFMPEG_LIBRARIES "${FFMPEG_LIBRARIES}/*.so")
