Commit c9eaf670 authored by David Partyka's avatar David Partyka Committed by David Partyka
Browse files

COMP: Use FFMPEG_BASIC_LIBRARIES instead of FFMPEG_LIBRARIES.

parent cb542863
......@@ -122,6 +122,11 @@ IF(FFMPEG_INCLUDE_DIR)
${FFMPEG_avformat_LIBRARY}
${FFMPEG_avutil_LIBRARY}
)
# swscale is always a part of newer ffmpeg distros
IF(FFMPEG_swscale_LIBRARY)
LIST(APPEND FFMPEG_BASIC_LIBRARIES ${FFMPEG_swscale_LIBRARY})
ENDIF(FFMPEG_swscale_LIBRARY)
SET(FFMPEG_LIBRARIES ${FFMPEG_BASIC_LIBRARIES})
......@@ -149,10 +154,6 @@ IF(FFMPEG_INCLUDE_DIR)
LIST(APPEND FFMPEG_LIBRARIES ${FFMPEG_gsm_LIBRARY})
ENDIF(FFMPEG_gsm_LIBRARY)
IF(FFMPEG_swscale_LIBRARY)
LIST(APPEND FFMPEG_LIBRARIES ${FFMPEG_swscale_LIBRARY})
ENDIF(FFMPEG_swscale_LIBRARY)
IF(FFMPEG_z_LIBRARY)
LIST(APPEND FFMPEG_LIBRARIES ${FFMPEG_z_LIBRARY})
ENDIF(FFMPEG_z_LIBRARY)
......
......@@ -193,7 +193,7 @@ IF(HAVE_PTHREAD_H AND CMAKE_USE_PTHREADS)
ENDIF()
IF(VTK_USE_FFMPEG_ENCODER)
LIST(APPEND VTKPYTHON_LINK_LIBS ${FFMPEG_LIBRARIES})
LIST(APPEND VTKPYTHON_LINK_LIBS ${FFMPEG_BASIC_LIBRARIES})
ENDIF(VTK_USE_FFMPEG_ENCODER)
TARGET_LINK_LIBRARIES(vtkpython ${VTKPYTHON_LINK_LIBS})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment