[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdemultimedia
From: Maciej Mrozowski <reavertm () gmail ! com>
Date: 2010-05-12 12:16:00
Message-ID: 20100512121600.F2ADCAC8B3 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1125812 by mmrozowski:
Add (missing) swscale CMake module, remove redundant FFMPEG_FOUND CMake guards within \
ffmpegthumbs
CCMAIL: ascherfy@googlemail.com
CCMAIL: kde-buildsystem@kde.org
M +1 -0 CMakeLists.txt
A cmake/modules/FindSwscale.cmake
M +3 -8 ffmpegthumbs/CMakeLists.txt
--- trunk/KDE/kdemultimedia/CMakeLists.txt #1125811:1125812
@@ -19,6 +19,7 @@
macro_optional_find_package(FFmpeg)
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)
--- trunk/KDE/kdemultimedia/ffmpegthumbs/CMakeLists.txt #1125811:1125812
@@ -21,24 +21,18 @@
endif(HAVE_FFMPEG_SWSCALE)
-if( FFMPEG_FOUND )
set( ffmpegthumbs_PART_SRCS
-
ffmpegthumbnailer.cpp
ffmpegthumbnailer/filmstripfilter.cpp
ffmpegthumbnailer/moviedecoder.cpp
ffmpegthumbnailer/imagewriter.cpp
ffmpegthumbnailer/videothumbnailer.cpp
)
-endif( FFMPEG_FOUND )
-
kde4_add_plugin(ffmpegthumbs ${ffmpegthumbs_PART_SRCS})
-if ( FFMPEG_FOUND )
target_link_libraries(ffmpegthumbs ${KDE4_KIO_LIBS} ${AVUTIL_LIBRARIES} \
${AVFORMAT_LIBRARIES} ${AVCODEC_LIBRARIES} ${SWSCALE_LIBRARIES} )
-endif ( FFMPEG_FOUND )
install(TARGETS ffmpegthumbs DESTINATION ${PLUGIN_INSTALL_DIR})
@@ -46,6 +40,7 @@
########### install files ###############
install(FILES ffmpegthumbs.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-add_subdirectory(tests)
-
+if (KDE4_BUILD_TESTS)
+ add_subdirectory(tests)
+endif (KDE4_BUILD_TESTS)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic