[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47076] trunk/blender/CMakeLists.txt: Patch #31563: Additional include directory for FFMPEG

[Sergey Sharybin]

Revision: 47076
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47076
Author:   nazgul
Date:     2012-05-27 13:44:21 +0000 (Sun, 27 May 2012)
Log Message:
-----------
Patch #31563: Additional include directory for FFMPEG

Fedora 16 is still using /usr/include/ffmpeg, not /usr/include to store FFmpeg's
headers. Added it to search paths.

Also remove FFmpeg include directory listed in FFMPEG_INCLUDE_DIRS twice

Patch by Arno Mayrhofer	(aka azrael3000), thanks!

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-05-27 13:33:09 UTC (rev 47075)
+++ trunk/blender/CMakeLists.txt	2012-05-27 13:44:21 UTC (rev 47076)
@@ -558,7 +558,7 @@
 		endif()
 
 		mark_as_advanced(FFMPEG)
-		set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
+		set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include/ffmpeg)
 		mark_as_advanced(FFMPEG_LIBRARIES)
 		set(FFMPEG_LIBPATH ${FFMPEG}/lib)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
@@ -1106,7 +1106,7 @@
 
 		if(WITH_CODEC_FFMPEG)
 			set(FFMPEG ${LIBDIR}/ffmpeg)
-			set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include)
+			set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
 			if(WITH_MINGW64)
 				set(FFMPEG_LIBRARIES avcodec.dll avformat.dll avdevice.dll avutil.dll swscale.dll swresample.dll)
 			else()