From 60740fbefc95dea5ab6a4b996b0510f2f7ac1491 Mon Sep 17 00:00:00 2001 From: Javier Serrano Polo Date: Sat, 30 Apr 2016 02:10:22 +0200 Subject: [PATCH] Removed useless dependencies --- plugins/LadspaEffect/swh/CMakeLists.txt | 6 +++++- plugins/zynaddsubfx/CMakeLists.txt | 8 +++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/plugins/LadspaEffect/swh/CMakeLists.txt b/plugins/LadspaEffect/swh/CMakeLists.txt index fb203c6da..2d8aa2b26 100644 --- a/plugins/LadspaEffect/swh/CMakeLists.txt +++ b/plugins/LadspaEffect/swh/CMakeLists.txt @@ -4,13 +4,16 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include" ${FFTW3F_INCLUDE_DIRS} "${CMAKE_BINARY_DIR}") LINK_DIRECTORIES(${FFTW3F_LIBRARY_DIRS}) -LINK_LIBRARIES(-lfftw3f) FILE(GLOB PLUGIN_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.c") FOREACH(_item ${PLUGIN_SOURCES}) GET_FILENAME_COMPONENT(_plugin "${_item}" NAME_WE) ADD_LIBRARY("${_plugin}" MODULE "${_item}") + # vocoder_1337 does not use fftw3f + IF(NOT ("${_plugin}" STREQUAL "vocoder_1337")) + TARGET_LINK_LIBRARIES("${_plugin}" -lfftw3f) + ENDIF() INSTALL(TARGETS "${_plugin}" LIBRARY DESTINATION "${PLUGIN_DIR}/ladspa") SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES PREFIX "") SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES COMPILE_FLAGS "-O3 -Wall -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -c -fno-strict-aliasing") @@ -71,5 +74,6 @@ TARGET_LINK_LIBRARIES(se4_1883 rms db) ADD_LIBRARY(pitchscale STATIC util/pitchscale.c) SET_TARGET_PROPERTIES(pitchscale PROPERTIES COMPILE_FLAGS "${PIC_FLAGS}") +TARGET_LINK_LIBRARIES(pitchscale -lfftw3f) TARGET_LINK_LIBRARIES(pitch_scale_1193 pitchscale) TARGET_LINK_LIBRARIES(pitch_scale_1194 pitchscale) diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt index b550db6e2..1fb8a61cd 100644 --- a/plugins/zynaddsubfx/CMakeLists.txt +++ b/plugins/zynaddsubfx/CMakeLists.txt @@ -153,16 +153,18 @@ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}") SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp "${WINRC}") INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION "${PLUGIN_DIR}") -TARGET_LINK_LIBRARIES(RemoteZynAddSubFx zynaddsubfx_gui ZynAddSubFxCore ${FLTK_LIBRARIES} -lpthread ) +SET(FLTK_FILTERED_LIBRARIES ${FLTK_LIBRARIES}) +LIST(REMOVE_ITEM FLTK_FILTERED_LIBRARIES "${X11_X11_LIB}" "${X11_Xext_LIB}") +TARGET_LINK_LIBRARIES(RemoteZynAddSubFx zynaddsubfx_gui ZynAddSubFxCore ${FLTK_FILTERED_LIBRARIES} -lpthread ) # link Qt libraries when on win32 IF(LMMS_BUILD_WIN32) TARGET_LINK_LIBRARIES(RemoteZynAddSubFx ${QT_LIBRARIES}) ENDIF(LMMS_BUILD_WIN32) -# FLTK needs X +# FLTK needs X (is libdl not linked in libfltk?) IF(LMMS_BUILD_LINUX) - TARGET_LINK_LIBRARIES(RemoteZynAddSubFx ${CMAKE_DL_LIBS}) +# TARGET_LINK_LIBRARIES(RemoteZynAddSubFx ${CMAKE_DL_LIBS}) ENDIF(LMMS_BUILD_LINUX)