forked from bartvdbraak/blender
ffmpeg was adding an include just incase
, without a cmake find module here - just check if the dir exists.
This commit is contained in:
parent
f85af96d44
commit
ff834242b7
@ -565,7 +565,14 @@ if(UNIX AND NOT APPLE)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
mark_as_advanced(FFMPEG)
|
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)
|
mark_as_advanced(FFMPEG_LIBRARIES)
|
||||||
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
|
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
|
||||||
|
Loading…
Reference in New Issue
Block a user