diff options
| -rw-r--r-- | src/plugins/Input/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/plugins/Input/ffmpeg/CMakeLists.txt | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/plugins/Input/CMakeLists.txt b/src/plugins/Input/CMakeLists.txt index 2cd772223..501618f14 100644 --- a/src/plugins/Input/CMakeLists.txt +++ b/src/plugins/Input/CMakeLists.txt @@ -29,9 +29,9 @@ IF(USE_VORBIS AND TAGLIB_FOUND) add_subdirectory(vorbis) ENDIF(USE_VORBIS AND TAGLIB_FOUND) -IF(USE_FFMPEG) +IF(USE_FFMPEG AND TAGLIB_FOUND) add_subdirectory(ffmpeg) -ENDIF(USE_FFMPEG) +ENDIF(USE_FFMPEG AND TAGLIB_FOUND) IF(USE_MPC AND TAGLIB_FOUND) add_subdirectory(mpc) diff --git a/src/plugins/Input/ffmpeg/CMakeLists.txt b/src/plugins/Input/ffmpeg/CMakeLists.txt index 0a347c4d7..14992cf08 100644 --- a/src/plugins/Input/ffmpeg/CMakeLists.txt +++ b/src/plugins/Input/ffmpeg/CMakeLists.txt @@ -17,6 +17,10 @@ include_directories(${FFMPEG_INCLUDE_DIRS}) link_directories(${FFMPEG_LIBRARY_DIRS}) ADD_DEFINITIONS(${FFMPEG_CFLAGS}) +include_directories(${TAGLIB_INCLUDE_DIRS}) +link_directories(${TAGLIB_LIBRARY_DIRS}) +ADD_DEFINITIONS(${TAGLIB_CFLAGS}) + SET(libffmpeg_SRCS decoder_ffmpeg.cpp decoder_ffmpegcue.cpp @@ -53,6 +57,6 @@ IF(FFMPEG_FOUND) ADD_LIBRARY(ffmpeg MODULE ${libffmpeg_SRCS} ${libffmpeg_UIS_H} ${libffmpeg_RCC_SRCS} ${libffmpeg_HDRS}) add_dependencies(ffmpeg libqmmp) -target_link_libraries(ffmpeg Qt5::Widgets libqmmp ${FFMPEG_LDFLAGS}) +target_link_libraries(ffmpeg Qt5::Widgets libqmmp ${FFMPEG_LDFLAGS} ${TAGLIB_LDFLAGS}) install(TARGETS ffmpeg DESTINATION ${PLUGIN_DIR}/Input) ENDIF(FFMPEG_FOUND) |