[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdemultimedia
From:       Michael Jansen <kde () michael-jansen ! biz>
Date:       2011-06-28 18:11:20
Message-ID: 20110628181120.D0015AC7E9 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1238717 by mjansen:

Fix FindFFMPEG.cmake.

It checked for avutil.h in a directory libavutil. In result setting \
                AVUTIL_INCLUDE_DIRS to
 .../include/libavutil which goes against the recommended and practiced way of doing
include <libavutil/avutil.h>.

It is planned to push the new FindFFmpeg.cmake file to kdelibs therefore \
eliminitating the need for the version checked in here with kde 4.8.

CCMAIL: kde-buildsystem@cmake.org
CCMAIL: tirtha.p.chatterjee@gmail.com

 M  +1 -2      CMakeLists.txt  
 D             cmake/modules/FindFFMPEG.cmake  
 A             cmake/modules/FindFFmpeg.cmake  


--- trunk/KDE/kdemultimedia/CMakeLists.txt #1238716:1238717
@@ -17,9 +17,8 @@
 
 alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h)
 
-macro_optional_find_package(FFMPEG)
+macro_optional_find_package(FFmpeg COMPONENTS AVCODEC AVFORMAT SWSCALE)
 macro_log_feature(FFMPEG_FOUND "FFmpeg" "FFmpeg libraries" "FFmpeg" FALSE \
                "http://www.ffmpeg.org" "FFmpeg required for FFMpegVideoPreview \
                backend")
-macro_optional_find_package(Swscale)
 macro_log_feature(SWSCALE_FOUND "swscale" "FFmpeg video scaling libraries" "swscale" \
FALSE "" "swscale required for FFMpegVideoPreview backend")  
 macro_optional_find_package(Xine)


[prev in list] [next in list] [prev in thread] [next in thread]