From 37c39e68a8703cfb14c9c7277c11ce294c65c424 Mon Sep 17 00:00:00 2001 From: Javier Serrano Polo Date: Thu, 5 May 2016 23:03:46 +0200 Subject: [PATCH] Fixed link to module --- plugins/zynaddsubfx/CMakeLists.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt index 9922f73cb..e92386a5b 100644 --- a/plugins/zynaddsubfx/CMakeLists.txt +++ b/plugins/zynaddsubfx/CMakeLists.txt @@ -141,13 +141,12 @@ ELSE(LMMS_BUILD_WIN32) ENDIF(LMMS_BUILD_WIN32) IF(LMMS_BUILD_LINUX) - LINK_LIBRARIES(ZynAddSubFxCore -Wl,--enable-new-dtags) + LINK_LIBRARIES(-Wl,--enable-new-dtags) ENDIF() SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}") BUILD_PLUGIN(zynaddsubfx ZynAddSubFx.cpp ZynAddSubFx.h MOCFILES ZynAddSubFx.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") -IF(NOT LMMS_BUILD_LINUX) - TARGET_LINK_LIBRARIES(zynaddsubfx ZynAddSubFxCore) -ENDIF() +TARGET_LINK_LIBRARIES(zynaddsubfx -L.. -lZynAddSubFxCore) +ADD_DEPENDENCIES(zynaddsubfx ZynAddSubFxCore) IF(WIN32) SET(WINRC "${CMAKE_CURRENT_BINARY_DIR}/zynaddsubfxrc.obj") @@ -173,11 +172,12 @@ IF(FLTK_CONFIG AND NOT (LMMS_BUILD_APPLE OR LMMS_BUILD_WIN32)) STRING(REPLACE " " ";" FLTK_FILTERED_LDFLAGS ${FLTK_FILTERED_LDFLAGS}) LIST(REMOVE_ITEM FLTK_FILTERED_LDFLAGS -lX11) ENDIF() -IF(LMMS_BUILD_LINUX) - TARGET_LINK_LIBRARIES(RemoteZynAddSubFx zynaddsubfx_gui ${FLTK_FILTERED_LDFLAGS} -lpthread ) -ELSE() - TARGET_LINK_LIBRARIES(RemoteZynAddSubFx zynaddsubfx_gui ZynAddSubFxCore ${FLTK_FILTERED_LDFLAGS} -lpthread ) -ENDIF() +TARGET_LINK_LIBRARIES(RemoteZynAddSubFx zynaddsubfx_gui -L.. -lZynAddSubFxCore ${FLTK_FILTERED_LDFLAGS} -lpthread ) +ADD_DEPENDENCIES(RemoteZynAddSubFx ZynAddSubFxCore) + +IF(QT5) + TARGET_LINK_LIBRARIES(RemoteZynAddSubFx Qt5::Core) +ENDIF(QT5) # link Qt libraries when on win32 IF(LMMS_BUILD_WIN32)