diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-09-20 11:43:48 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-20 11:43:48 +0400 |
| commit | ff834242b76240ab0004d830813892488ec4865c (patch) | |
| tree | 0b313b3ecd579a3763f53656a46c597ee12ae5ca /CMakeLists.txt | |
| parent | f85af96d4451494c6c34e30d2b0196b59a734c35 (diff) | |
ffmpeg was adding an include `just incase`, without a cmake find module here - just check if the dir exists.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 8 insertions, 1 deletions
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") |