diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2013-02-10 19:14:26 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2013-02-10 19:14:26 +0000 |
| commit | 3a9a1110e1b3c70fd0ec0699b032a3c2b502e121 (patch) | |
| tree | 27016a28de09dd3b403d81b63b7b5c287052bee0 /src | |
| parent | 0f68d4ba416d993cacdaee0244f8c633f8d62b7b (diff) | |
| download | qmmp-3a9a1110e1b3c70fd0ec0699b032a3c2b502e121.tar.gz qmmp-3a9a1110e1b3c70fd0ec0699b032a3c2b502e121.tar.bz2 qmmp-3a9a1110e1b3c70fd0ec0699b032a3c2b502e121.zip | |
fixed cmake support
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3224 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/Input/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/Input/ffmpeg_legacy/CMakeLists.txt | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/plugins/Input/CMakeLists.txt b/src/plugins/Input/CMakeLists.txt index ba943f1ff..123f14618 100644 --- a/src/plugins/Input/CMakeLists.txt +++ b/src/plugins/Input/CMakeLists.txt @@ -3,7 +3,7 @@ SET(USE_MAD TRUE CACHE BOOL "enable/disable mad plugin") SET(USE_FLAC TRUE CACHE BOOL "enable/disable flac plugin") SET(USE_VORBIS TRUE CACHE BOOL "enable/disable ogg vorbis plugin") SET(USE_FFMPEG TRUE CACHE BOOL "enable/disable ffmpeg plugin") -SET(USE_FFMPEG_LEGACY TRUE CACHE BOOL "enable/disable ffmpeg_legacy plugin") +SET(USE_FFMPEG_LEGACY FALSE CACHE BOOL "enable/disable ffmpeg_legacy plugin") SET(USE_MPC TRUE CACHE BOOL "enable/disable mpc plugin") SET(USE_SNDFILE TRUE CACHE BOOL "enable/disable sndfile plugin") SET(USE_WAVPACK TRUE CACHE BOOL "enable/disable wavpack plugin") diff --git a/src/plugins/Input/ffmpeg_legacy/CMakeLists.txt b/src/plugins/Input/ffmpeg_legacy/CMakeLists.txt index 1bd262230..096a736ab 100644 --- a/src/plugins/Input/ffmpeg_legacy/CMakeLists.txt +++ b/src/plugins/Input/ffmpeg_legacy/CMakeLists.txt @@ -1,6 +1,6 @@ project(libffmpeg) -cmake_minimum_required(VERSION 2.4.7) +cmake_minimum_required(VERSION 2.6.0) if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) @@ -28,10 +28,9 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) # minimal supported versions -# libav-0.8: libavcodec-53.34.0, libavformat-53.20.0, libavutil-51.21.0 -# ffmpeg-0.9: libavcodec-53.42.0, libavformat-53.24.0, libavutil-51.32.0 # ffmpeg-0.6: libavcodec-52.72.2, libavformat-52.64.2, libavutil-50.15.1 -pkg_check_modules(FFMPEG_LEGACY libavcodec<53.34.0 libavformat<53.20.0 libavutil<51.21.0) +pkg_check_modules(FFMPEG_LEGACY libavcodec>=52.72.2 libavformat>=52.64.2 libavutil>=50.15.1) + include_directories(${FFMPEG_INCLUDE_DIRS}) link_directories(${FFMPEG_LIBRARY_DIRS}) @@ -77,5 +76,5 @@ ADD_LIBRARY(ffmpeg_legacy MODULE ${libffmpeg_SRCS} ${libffmpeg_MOC_SRCS} ${libff ${libffmpeg_RCC_SRCS} ${libffmpeg_HDRS}) add_dependencies(ffmpeg_legacy qmmp) target_link_libraries(ffmpeg_legacy ${QT_LIBRARIES} -lqmmp ${FFMPEG_LDFLAGS}) -install(TARGETS ffmpeg DESTINATION ${LIB_DIR}/qmmp/Input) +install(TARGETS ffmpeg_legacy DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(FFMPEG_LEGACY_FOUND) |