From f3a81cc15b9cbd3787869e2a4a32fcd82c90c8c4 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 15 Oct 2011 08:37:10 +0000 Subject: fixed incorrect cflags usage git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2401 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/ffmpeg/CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/plugins/Input/ffmpeg') diff --git a/src/plugins/Input/ffmpeg/CMakeLists.txt b/src/plugins/Input/ffmpeg/CMakeLists.txt index dfad4a427..097a5e80c 100644 --- a/src/plugins/Input/ffmpeg/CMakeLists.txt +++ b/src/plugins/Input/ffmpeg/CMakeLists.txt @@ -27,14 +27,12 @@ SET(QT_INCLUDES include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) -# libffmpeg +# ffmpeg pkg_check_modules(FFMPEG libavcodec>=52.20.0 libavformat>=52.31.0 libavutil>=49.15.0) include_directories(${FFMPEG_INCLUDE_DIRS}) link_directories(${FFMPEG_LIBRARY_DIRS}) - -ADD_DEFINITIONS(${LIBAVCODEC_CFLAGS}) -ADD_DEFINITIONS(${LIBAVFORMAT_CFLAGS}) +ADD_DEFINITIONS(${FFMPEG_CFLAGS}) SET(libffmpeg_SRCS decoder_ffmpeg.cpp @@ -75,6 +73,6 @@ IF(FFMPEG_FOUND) ADD_LIBRARY(ffmpeg MODULE ${libffmpeg_SRCS} ${libffmpeg_MOC_SRCS} ${libffmpeg_UIS_H} ${libffmpeg_RCC_SRCS} ${libffmpeg_HDRS}) add_dependencies(ffmpeg qmmp) -target_link_libraries(ffmpeg ${QT_LIBRARIES} -lqmmp ${FFMPEG_LDFLAGS} ${FFMPEG_CFLAGS}) +target_link_libraries(ffmpeg ${QT_LIBRARIES} -lqmmp ${FFMPEG_LDFLAGS}) install(TARGETS ffmpeg DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(FFMPEG_FOUND) -- cgit v1.2.3-13-gbd6f