Merge pull request #246 from cchampet/cmake_fixDependencySwAvResample_2

valnoel · valnoel · commit a87d5134bc16 · 2015-10-02T16:27:14.000+02:00
CMake: fix double dependencies of av/sw resample
diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake
@@ -94,9 +94,15 @@ macro(manage_components)
 		# If the component is found.
 		if(${COMPONENT}_FOUND)
 			message(STATUS "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})
+			# Skip components which are in a different location
+			# This prevents us to depend on libav system libraries if we build with ffmpeg (and the reverse).
+			if(NOT FFMPEG_INCLUDE_DIR OR FFMPEG_INCLUDE_DIR STREQUAL ${${COMPONENT}_INCLUDE_DIR})
+				set(FFMPEG_INCLUDE_DIR ${${COMPONENT}_INCLUDE_DIR})
+				set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${${COMPONENT}_LIBRARIES})
+				set(FFMPEG_DEFINITIONS ${FFMPEG_DEFINITIONS} ${${COMPONENT}_DEFINITIONS})
+                        else()
+                                set(${COMPONENT}_FOUND FALSE)
+			endif()
 		else()
 			if(FFmpeg_FIND_REQUIRED)
 				message(SEND_ERROR "Error: required component ${COMPONENT} missing.")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -6,12 +6,12 @@ include(AvTranscoderMacros)
 find_package(FFmpeg COMPONENTS avcodec avformat avutil swscale swresample avresample)
 
 # Check if FFmpeg or libav dependency
-if(avresample_FOUND)
-	add_definitions(-DAVTRANSCODER_LIBAV_DEPENDENCY)
-	message("Build avTranscoder with dependency to libav.")
-elseif(swresample_FOUND)
+if(swresample_FOUND)
 	add_definitions(-DAVTRANSCODER_FFMPEG_DEPENDENCY)
         message("Build avTranscoder with dependency to ffmpeg.")
+elseif(avresample_FOUND)
+	add_definitions(-DAVTRANSCODER_LIBAV_DEPENDENCY)
+	message("Build avTranscoder with dependency to libav.")
 else()
         message(SEND_ERROR "Can't define if you depend on ffmpeg or libav.")
 endif()
