[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50771] trunk/blender/CMakeLists.txt: ffmpeg was adding an include `just incase`, without a cmake find module here - just check if the dir exists.

[Campbell Barton]

Revision: 50771
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50771
Author:   campbellbarton
Date:     2012-09-20 07:43:48 +0000 (Thu, 20 Sep 2012)
Log Message:
-----------
ffmpeg was adding an include `just incase`, without a cmake find module here - just check if the dir exists.

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

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-09-20 05:09:35 UTC (rev 50770)
+++ trunk/blender/CMakeLists.txt	2012-09-20 07:43:48 UTC (rev 50771)
@@ -565,7 +565,14 @@
 		endif()
 
 		mark_as_advanced(FFMPEG)
-		set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include/ffmpeg)
+
+		# lame, but until we have propper find module for ffmpeg
+		set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
+		if(EXISTS "${FFMPEG}/include/ffmpeg/")
+			set(FFMPEG_INCLUDE_DIRS "${FFMPEG_INCLUDE_DIRS} ${FFMPEG}/include/ffmpeg")
+		endif()
+		# end lameness
+
 		mark_as_advanced(FFMPEG_LIBRARIES)
 		set(FFMPEG_LIBPATH ${FFMPEG}/lib)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")