From 1eda555e93620be4424a14efb5fd93f0d128368d Mon Sep 17 00:00:00 2001 From: Javier Serrano Polo Date: Wed, 4 May 2016 18:35:36 +0200 Subject: [PATCH] Use fltk-config to avoid static library --- plugins/zynaddsubfx/CMakeLists.txt | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt index 1fb8a61cd..95f0a5aed 100644 --- a/plugins/zynaddsubfx/CMakeLists.txt +++ b/plugins/zynaddsubfx/CMakeLists.txt @@ -153,20 +153,23 @@ 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}") -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 ) + +# Remove useless dependencies from FLTK. Use fltk-config to avoid static library +# in older environments +SET(FLTK_FILTERED_LDFLAGS ${FLTK_LIBRARIES}) +FIND_PROGRAM(FLTK_CONFIG fltk-config) +IF(FLTK_CONFIG AND NOT (LMMS_BUILD_APPLE OR LMMS_BUILD_WIN32)) + EXECUTE_PROCESS(COMMAND ${FLTK_CONFIG} --ldflags OUTPUT_VARIABLE FLTK_FILTERED_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) + STRING(REPLACE " " ";" FLTK_FILTERED_LDFLAGS ${FLTK_FILTERED_LDFLAGS}) + LIST(REMOVE_ITEM FLTK_FILTERED_LDFLAGS -lX11) +ENDIF() +TARGET_LINK_LIBRARIES(RemoteZynAddSubFx zynaddsubfx_gui ZynAddSubFxCore ${FLTK_FILTERED_LDFLAGS} -lpthread ) # link Qt libraries when on win32 IF(LMMS_BUILD_WIN32) TARGET_LINK_LIBRARIES(RemoteZynAddSubFx ${QT_LIBRARIES}) ENDIF(LMMS_BUILD_WIN32) -# FLTK needs X (is libdl not linked in libfltk?) -IF(LMMS_BUILD_LINUX) -# TARGET_LINK_LIBRARIES(RemoteZynAddSubFx ${CMAKE_DL_LIBS}) -ENDIF(LMMS_BUILD_LINUX) - IF(LMMS_BUILD_WIN32) ADD_CUSTOM_COMMAND(TARGET ZynAddSubFxCore POST_BUILD COMMAND "${STRIP}" \"$\")