From d2ecd34d664e4208288d376aca34876382764710 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 22 Feb 2010 10:10:08 +0000 Subject: [PATCH] Fixed STDINT_INCLUDE path --- CMakeModules/FindFFmpeg.cmake | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeModules/FindFFmpeg.cmake b/CMakeModules/FindFFmpeg.cmake index 4b7ef1f81..4d7eeb995 100644 --- a/CMakeModules/FindFFmpeg.cmake +++ b/CMakeModules/FindFFmpeg.cmake @@ -130,9 +130,7 @@ IF (FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVDEVICE_FOUND AND FFMPEG_LIBAVCODE SET(FFMPEG_FOUND "YES") - SET(FFMPEG_INCLUDE_DIRS ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}) - - SET(FFMPEG_INCLUDE_DIRS + SET(FFMPEG_INCLUDE_DIRS ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS} ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}/libavformat ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS} ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS}/libavdevice ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS} ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}/libavcodec @@ -141,7 +139,8 @@ IF (FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVDEVICE_FOUND AND FFMPEG_LIBAVCODE IF (${FFMPEG_STDINT_INCLUDE_DIR}) SET(FFMPEG_INCLUDE_DIRS - $PFFMPEG_INCLUDE_DIRS} + ${FFMPEG_INCLUDE_DIRS} + ${FFMPEG_STDINT_INCLUDE_DIR} ${FFMPEG_STDINT_INCLUDE_DIR}/libavformat ${FFMPEG_STDINT_INCLUDE_DIR}/libavdevice ${FFMPEG_STDINT_INCLUDE_DIR}/libavcodec