diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/Input/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/plugins/Input/xmp/CMakeLists.txt | 7 |
3 files changed, 9 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f20ffa4b3..63eba193f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -168,7 +168,7 @@ PRINT_SUMMARY ("MPEG support .........................." 1 MAD_FOUND OR MPG123_F PRINT_SUMMARY ("FLAC support .........................." USE_FLAC FLAC_FOUND) PRINT_SUMMARY ("Ogg Vorbis support ...................." USE_VORBIS VORBIS_FOUND) PRINT_SUMMARY ("Musepack support ......................" USE_MPC MPC_FOUND) -PRINT_SUMMARY ("MOD support ..........................." USE_MODPLUG MODPLUG_FOUND) +PRINT_SUMMARY ("MOD support ..........................." USE_XMP XMP_FOUND) PRINT_SUMMARY ("Wave support .........................." USE_SNDFILE SNDFILE_FOUND) PRINT_SUMMARY ("WavPack support ......................." USE_WAVPACK WAVPACK_FOUND) PRINT_SUMMARY ("FFmpeg support ........................" USE_FFMPEG FFMPEG_FOUND) diff --git a/src/plugins/Input/CMakeLists.txt b/src/plugins/Input/CMakeLists.txt index 501618f14..ed826ba36 100644 --- a/src/plugins/Input/CMakeLists.txt +++ b/src/plugins/Input/CMakeLists.txt @@ -6,7 +6,7 @@ SET(USE_FFMPEG TRUE CACHE BOOL "enable/disable ffmpeg 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") -SET(USE_MODPLUG TRUE CACHE BOOL "enable/disable modplug plugin") +SET(USE_XMP TRUE CACHE BOOL "enable/disable xmp plugin") SET(USE_AAC TRUE CACHE BOOL "enable/disable aac plugin") SET(USE_CUE TRUE CACHE BOOL "enable/disable cue plugin") SET(USE_CDA TRUE CACHE BOOL "enable/disable cd audio support") @@ -45,9 +45,9 @@ IF(USE_WAVPACK) add_subdirectory(wavpack) ENDIF(USE_WAVPACK) -IF(USE_MODPLUG) -add_subdirectory(modplug) -ENDIF(USE_MODPLUG) +IF(USE_XMP) +add_subdirectory(xmp) +ENDIF(USE_XMP) IF(USE_AAC AND TAGLIB_FOUND) add_subdirectory(aac) diff --git a/src/plugins/Input/xmp/CMakeLists.txt b/src/plugins/Input/xmp/CMakeLists.txt index a422b16aa..6e1958263 100644 --- a/src/plugins/Input/xmp/CMakeLists.txt +++ b/src/plugins/Input/xmp/CMakeLists.txt @@ -1,8 +1,8 @@ project(libxmp) # libqmmp -include_directories(${QMMP_INCLUDE_DIRS}) -link_directories(${QMMP_LIBRARY_DIRS}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) +link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) # xmp pkg_search_module(XMP libxmp) @@ -40,6 +40,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(XMP_FOUND) ADD_LIBRARY(xmp MODULE ${libxmp_SRCS} ${libxmp_UIS_H} ${libxmp_RCC_SRCS} ${libxmp_HDRS}) -target_link_libraries(xmp Qt5::Widgets ${QMMP_LDFLAGS} ${XMP_LDFLAGS}) +add_dependencies(xmp libqmmp) +target_link_libraries(xmp Qt5::Widgets libqmmp ${XMP_LDFLAGS}) install(TARGETS xmp DESTINATION ${PLUGIN_DIR}/Input) ENDIF(XMP_FOUND) |