Travis: fix build

Clement Champetier · Clement Champetier · commit a127ede86667 · 2014-09-09T15:47:35.000+02:00
diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake
@@ -76,8 +76,9 @@ macro(find_component COMPONENT PKGCONFIG LIBRARY HEADER)
 endmacro()
 
 # Get FFmpeg from custom install
-if(FFMPEG_LIBRARIES AND FFMPEG_INCLUDE_DIR)
+if(FFMPEG_LIBRARY_DIR AND FFMPEG_INCLUDE_DIR)
 	set(FFMPEG_FOUND TRUE)
+	file(GLOB FFMPEG_LIBRARIES "${FFMPEG_LIBRARY_DIR}/*.so")
 # Get FFmpeg from system install
 else()
 	# Check FFmpeg version
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -6,9 +6,6 @@ include(AvTranscoderMacros)
 find_package(FFmpeg
 	COMPONENTS avcodec avformat avutil swscale swresample avresample)
 
-# get FFmpeg / libav libraries from path
-file(GLOB FFMPEG_LIBRARIES "${FFMPEG_LIBRARIES}/*.so")
-
 # Check if FFmpeg or libav dependency
 if(EXISTS "${FFMPEG_INCLUDE_DIR}/libavresample/avresample.h")
 	add_definitions(-DAV_RESAMPLE_LIBRARY=1)
