From: <ble...@us...> - 2008-04-25 17:24:36
|
Revision: 2167 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2167&view=rev Author: blendamedt Date: 2008-04-25 10:24:27 -0700 (Fri, 25 Apr 2008) Log Message: ----------- fix ffmpeg include path Modified Paths: -------------- trunk/kdenlive/cmake/modules/FindLIBFFMPEG.cmake Modified: trunk/kdenlive/cmake/modules/FindLIBFFMPEG.cmake =================================================================== --- trunk/kdenlive/cmake/modules/FindLIBFFMPEG.cmake 2008-04-11 21:21:18 UTC (rev 2166) +++ trunk/kdenlive/cmake/modules/FindLIBFFMPEG.cmake 2008-04-25 17:24:27 UTC (rev 2167) @@ -3,8 +3,8 @@ # FIND_PATH(LIBFFMPEG_INCLUDE_DIR - NAMES ffmpeg/avformat.h - PATHS ${MLT_PATH}/include /usr/local/include /usr/include + NAMES avformat.h + PATHS ${MLT_PATH}/include /usr/local/include/libavformat /usr/local/include/ffmpeg /usr/include/libavformat /usr/include/ffmpeg NO_DEFAULT_PATH ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-05-16 21:19:33
|
Revision: 2190 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2190&view=rev Author: j-b-m Date: 2008-05-16 14:19:40 -0700 (Fri, 16 May 2008) Log Message: ----------- updated FFmpeg detection Modified Paths: -------------- trunk/kdenlive/cmake/modules/FindLIBFFMPEG.cmake Modified: trunk/kdenlive/cmake/modules/FindLIBFFMPEG.cmake =================================================================== --- trunk/kdenlive/cmake/modules/FindLIBFFMPEG.cmake 2008-05-16 21:18:29 UTC (rev 2189) +++ trunk/kdenlive/cmake/modules/FindLIBFFMPEG.cmake 2008-05-16 21:19:40 UTC (rev 2190) @@ -2,22 +2,27 @@ # Find the FFMPEG includes and library # +FIND_PROGRAM(FFMPEG_CONFIG_EXECUTABLE pkg-config) +EXEC_PROGRAM(${FFMPEG_CONFIG_EXECUTABLE} ARGS --variable=includedir libavformat OUTPUT_VARIABLE FFMPEG_HEADER_PATH ) +MESSAGE(STATUS "Found FFmpeg header pkg-config: ${FFMPEG_CONFIG_EXECUTABLE} , ${FFMPEG_HEADER_PATH}") +EXEC_PROGRAM(${FFMPEG_CONFIG_EXECUTABLE} ARGS --variable=libdir libavformat OUTPUT_VARIABLE FFMPEG_LIBS_PATH ) +MESSAGE(STATUS "Found FFmpeg lib pkg-config: ${FFMPEG_CONFIG_EXECUTABLE} , ${FFMPEG_LIBS_PATH}") + + FIND_PATH(LIBFFMPEG_INCLUDE_DIR NAMES avformat.h - PATHS ${MLT_PATH}/include /usr/local/include/libavformat /usr/local/include/ffmpeg /usr/include/libavformat /usr/include/ffmpeg + PATHS ${FFMPEG_HEADER_PATH}/ffmpeg ${FFMPEG_HEADER_PATH}/libavformat ${FFMPEG_HEADER_PATH}/ffmpeg/libavformat NO_DEFAULT_PATH ) -MESSAGE(STATUS "Found FFMPEG INCLUDES: ${LIBFFMPEG_INCLUDE_DIR}") +MESSAGE(STATUS "Found FFmpeg INCLUDES: ${LIBFFMPEG_INCLUDE_DIR}") FIND_LIBRARY(LIBFFMPEG_LIBRARY NAMES avformat - PATHS ${MLT_PATH}/lib /usr/lib /usr/local/lib + PATHS ${FFMPEG_LIBS_PATH} NO_DEFAULT_PATH ) -MESSAGE(STATUS "Found FFMPEG LIBR: ${LIBFFMPEG_LIBRARY}") - IF (LIBFFMPEG_LIBRARY AND LIBFFMPEG_INCLUDE_DIR) SET( LIBFFMPEG_FOUND 1 ) SET( LIBFFMPEG_LIBRARIES ${LIBFFMPEG_LIBRARY} ) @@ -27,7 +32,7 @@ IF (LIBFFMPEG_FOUND) IF (NOT LIBFFMPEG_FIND_QUIETLY) - MESSAGE(STATUS "Found FFMPEG library: ${LIBFFMPEG_LIBRARY}") + MESSAGE(STATUS "Found FFmpeg library: ${LIBFFMPEG_LIBRARY}") ENDIF (NOT LIBFFMPEG_FIND_QUIETLY) ELSE (LIBFFMPEG_FOUND) IF (LIBFFMPEG_FIND_REQUIRED) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-05-20 09:52:41
|
Revision: 2192 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2192&view=rev Author: j-b-m Date: 2008-05-20 02:52:49 -0700 (Tue, 20 May 2008) Log Message: ----------- Updated FFmpeg detection Modified Paths: -------------- trunk/kdenlive/cmake/modules/FindLIBFFMPEG.cmake Modified: trunk/kdenlive/cmake/modules/FindLIBFFMPEG.cmake =================================================================== --- trunk/kdenlive/cmake/modules/FindLIBFFMPEG.cmake 2008-05-20 09:48:20 UTC (rev 2191) +++ trunk/kdenlive/cmake/modules/FindLIBFFMPEG.cmake 2008-05-20 09:52:49 UTC (rev 2192) @@ -4,25 +4,45 @@ FIND_PROGRAM(FFMPEG_CONFIG_EXECUTABLE pkg-config) EXEC_PROGRAM(${FFMPEG_CONFIG_EXECUTABLE} ARGS --variable=includedir libavformat OUTPUT_VARIABLE FFMPEG_HEADER_PATH ) -MESSAGE(STATUS "Found FFmpeg header pkg-config: ${FFMPEG_CONFIG_EXECUTABLE} , ${FFMPEG_HEADER_PATH}") +#MESSAGE(STATUS "Found FFmpeg header pkg-config: ${FFMPEG_CONFIG_EXECUTABLE} , ${FFMPEG_HEADER_PATH}") EXEC_PROGRAM(${FFMPEG_CONFIG_EXECUTABLE} ARGS --variable=libdir libavformat OUTPUT_VARIABLE FFMPEG_LIBS_PATH ) -MESSAGE(STATUS "Found FFmpeg lib pkg-config: ${FFMPEG_CONFIG_EXECUTABLE} , ${FFMPEG_LIBS_PATH}") +#MESSAGE(STATUS "Found FFmpeg lib pkg-config: ${FFMPEG_CONFIG_EXECUTABLE} , ${FFMPEG_LIBS_PATH}") - FIND_PATH(LIBFFMPEG_INCLUDE_DIR NAMES avformat.h PATHS ${FFMPEG_HEADER_PATH}/ffmpeg ${FFMPEG_HEADER_PATH}/libavformat ${FFMPEG_HEADER_PATH}/ffmpeg/libavformat + /usr/include/ffmpeg /usr/include/libavformat /usr/include/ffmpeg/libavformat + /usr/local/include/ffmpeg /usr/local/include/libavformat /usr/local/include/ffmpeg/libavformat NO_DEFAULT_PATH ) -MESSAGE(STATUS "Found FFmpeg INCLUDES: ${LIBFFMPEG_INCLUDE_DIR}") +IF (LIBFFMPEG_INCLUDE_DIR) + MESSAGE(STATUS "Found FFmpeg Libavformat includes: ${LIBFFMPEG_INCLUDE_DIR}") +ELSE (LIBFFMPEG_INCLUDE_DIR) + MESSAGE(FATAL_ERROR "\n***************************\n" + "Could not find FFmpeg Libavformat includes\n" + "please install the libavformat-dev package or give the path manually using\n" + "-DLIBFFMPEG_INCLUDE_DIR=PATH_TO_YOUR_AVFORMAT_HEADERS" + "\n***************************\n") +ENDIF (LIBFFMPEG_INCLUDE_DIR) FIND_LIBRARY(LIBFFMPEG_LIBRARY NAMES avformat PATHS ${FFMPEG_LIBS_PATH} + /usr/lib /usr/local/lib NO_DEFAULT_PATH ) +IF (LIBFFMPEG_LIBRARY) + MESSAGE(STATUS "Found FFmpeg Libavformat library: ${LIBFFMPEG_LIBRARY}") +ELSE (LIBFFMPEG_LIBRARY) + MESSAGE(FATAL_ERROR "\n***************************\n" + "Could not find FFmpeg Libavformat library\n" + "please install the libavformat package or give the path manually using\n" + "-DLIBFFMPEG_LIBRARY=PATH_TO_YOUR_AVFORMAT_LIBRARY" + "\n***************************\n") +ENDIF (LIBFFMPEG_LIBRARY) + IF (LIBFFMPEG_LIBRARY AND LIBFFMPEG_INCLUDE_DIR) SET( LIBFFMPEG_FOUND 1 ) SET( LIBFFMPEG_LIBRARIES ${LIBFFMPEG_LIBRARY} ) @@ -30,13 +50,4 @@ SET( LIBFFMPEG_FOUND 0 ) ENDIF (LIBFFMPEG_LIBRARY AND LIBFFMPEG_INCLUDE_DIR) -IF (LIBFFMPEG_FOUND) - IF (NOT LIBFFMPEG_FIND_QUIETLY) - MESSAGE(STATUS "Found FFmpeg library: ${LIBFFMPEG_LIBRARY}") - ENDIF (NOT LIBFFMPEG_FIND_QUIETLY) -ELSE (LIBFFMPEG_FOUND) - IF (LIBFFMPEG_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find FFMPEG library") - ENDIF (LIBFFMPEG_FIND_REQUIRED) -ENDIF (LIBFFMPEG_FOUND) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |