Commit c77b8f20 authored by David Partyka's avatar David Partyka
Browse files

Fix FFMPEG try_compile link failures.

When using older ffmpeg on the Mac the try_compiles are failing because a link error and thus were not producing accurate configuration results.
parent 65c78cbe
......@@ -25,7 +25,7 @@ IF (FFMPEG_INCLUDE_DIR)
${VTK_BINARY_DIR}/CMakeTmp
${VTK_CMAKE_DIR}/vtkFFMPEGTestImgConvert.cxx
CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${FFMPEG_INCLUDE_DIR}"
"-DLINK_LIBRARIES:STRING=${FFMPEG_avcodec_LIBRARY}"
"-DLINK_LIBRARIES:STRING=${FFMPEG_avcodec_LIBRARY};${FFMPEG_avutil_LIBRARY}"
-DCOMPILE_DEFINITIONS:STRING=-D${VTK_FFMPEG_CDEFS}
OUTPUT_VARIABLE OUTPUT)
IF(VTK_FFMPEG_HAS_IMG_CONVERT)
......@@ -56,9 +56,7 @@ IF (FFMPEG_INCLUDE_DIR)
${VTK_CMAKE_DIR}/vtkFFMPEGTestURLFClose.cxx
CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${FFMPEG_INCLUDE_DIR}"
-DCOMPILE_DEFINITIONS:STRING=-D${VTK_FFMPEG_CDEFS}
"-DLINK_LIBRARIES:STRING=${FFMPEG_avformat_LIBRARY}"
OUTPUT_VARIABLE OUTPUT)
"-DLINK_LIBRARIES:STRING=${FFMPEG_avformat_LIBRARY};${FFMPEG_avutil_LIBRARY};${FFMPEG_avcodec_LIBRARY}"
IF(VTK_FFMPEG_OLD_URL_FCLOSE)
MESSAGE(STATUS "Checking if FFMPEG uses old API for url_fclose - found")
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
......@@ -88,7 +86,6 @@ IF (FFMPEG_INCLUDE_DIR)
-DCOMPILE_DEFINITIONS:STRING=-D${VTK_FFMPEG_CDEFS}
"-DLINK_LIBRARIES:STRING=${FFMPEG_avformat_LIBRARY}"
OUTPUT_VARIABLE OUTPUT)
IF(VTK_FFMPEG_NEW_ALLOC)
MESSAGE(STATUS "Checking if FFMPEG has avformat_alloc_context - found")
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
......
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