Skip to content
Snippets Groups Projects
Commit ff834242 authored by Campbell Barton's avatar Campbell Barton
Browse files

ffmpeg was adding an include `just incase`, without a cmake find module here -...

ffmpeg was adding an include `just incase`, without a cmake find module here - just check if the dir exists.
parent f85af96d
No related branches found
No related tags found
No related merge requests found
......@@ -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")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment