From ff834242b76240ab0004d830813892488ec4865c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 20 Sep 2012 07:43:48 +0000 Subject: [PATCH] ffmpeg was adding an include `just incase`, without a cmake find module here - just check if the dir exists. --- CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f9e4898b7e5..b99d6463cbb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -565,7 +565,14 @@ if(UNIX AND NOT APPLE) 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")