From 390f3828780da66969e6a3ea812662daa1a77686 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sun, 19 Sep 2021 15:18:41 +0000 Subject: fixed cmake support git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@10306 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/CMakeLists.txt | 8 ++++---- src/plugins/Input/xmp/CMakeLists.txt | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'src/plugins/Input') 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) -- cgit v1.2.3-13-gbd6f