From febbf58a2d3afe75a1ae0bf921cdfb1fa18e391c Mon Sep 17 00:00:00 2001 From: Javier Serrano Polo Date: Mon, 9 May 2016 00:16:53 +0200 Subject: [PATCH] Remove SONAMEs from vestige and vst_base --- plugins/VstEffect/CMakeLists.txt | 8 +++----- plugins/vestige/CMakeLists.txt | 11 ++++------- plugins/vst_base/CMakeLists.txt | 6 +----- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/plugins/VstEffect/CMakeLists.txt b/plugins/VstEffect/CMakeLists.txt index 0b9c42c8d..dbe9377d8 100644 --- a/plugins/VstEffect/CMakeLists.txt +++ b/plugins/VstEffect/CMakeLists.txt @@ -2,12 +2,8 @@ IF(LMMS_SUPPORT_VST) INCLUDE(BuildPlugin) INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../vst_base") LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/..") -IF(LMMS_BUILD_WIN32) - LINK_LIBRARIES(vstbase) -ELSE() - LINK_LIBRARIES(vstbase -Wl,--enable-new-dtags) -ENDIF() IF(LMMS_BUILD_LINUX) + LINK_LIBRARIES(-Wl,--enable-new-dtags) SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) SET(CMAKE_INSTALL_RPATH "$ORIGIN") ELSE() @@ -19,6 +15,8 @@ ADD_DEFINITIONS(-std=c++0x) BUILD_PLUGIN(vsteffect VstEffect.cpp VstEffectControls.cpp VstEffectControlDialog.cpp VstSubPluginFeatures.cpp VstEffect.h VstEffectControls.h VstEffectControlDialog.h VstSubPluginFeatures.h MOCFILES VstEffectControlDialog.h VstEffectControls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") SET_TARGET_PROPERTIES(vsteffect PROPERTIES COMPILE_FLAGS "-Wno-attributes") +TARGET_LINK_LIBRARIES(vsteffect -lvstbase) +ADD_DEPENDENCIES(vsteffect vstbase) ENDIF(LMMS_SUPPORT_VST) diff --git a/plugins/vestige/CMakeLists.txt b/plugins/vestige/CMakeLists.txt index 40e1b1ecd..d2e84e934 100644 --- a/plugins/vestige/CMakeLists.txt +++ b/plugins/vestige/CMakeLists.txt @@ -6,17 +6,14 @@ IF(LMMS_SUPPORT_VST) INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../vst_base") LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/..") IF(LMMS_BUILD_LINUX) + LINK_LIBRARIES(-Wl,--enable-new-dtags) SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) SET(CMAKE_INSTALL_RPATH "$ORIGIN") ELSE() SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}") ENDIF() - IF(LMMS_BUILD_WIN32) - LINK_LIBRARIES(vstbase) - BUILD_PLUGIN(vestige vestige.cpp vestige.h MOCFILES vestige.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") - ELSE() - LINK_LIBRARIES(vstbase -Wl,--enable-new-dtags) - BUILD_PLUGIN(vestige vestige.cpp vestige.h MOCFILES vestige.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png" LINK SHARED) - ENDIF() + BUILD_PLUGIN(vestige vestige.cpp vestige.h MOCFILES vestige.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") + TARGET_LINK_LIBRARIES(vestige -lvstbase) + ADD_DEPENDENCIES(vestige vstbase) ENDIF(LMMS_SUPPORT_VST) diff --git a/plugins/vst_base/CMakeLists.txt b/plugins/vst_base/CMakeLists.txt index c7d5f74b5..0e99a5726 100644 --- a/plugins/vst_base/CMakeLists.txt +++ b/plugins/vst_base/CMakeLists.txt @@ -27,11 +27,7 @@ ENDIF(LMMS_BUILD_WIN32) SET(REMOTE_VST_PLUGIN_FILEPATH "RemoteVstPlugin" CACHE STRING "Relative file path to RemoteVstPlugin") ADD_DEFINITIONS(-DREMOTE_VST_PLUGIN_FILEPATH="${REMOTE_VST_PLUGIN_FILEPATH}") -IF(LMMS_BUILD_WIN32) - BUILD_PLUGIN(vstbase vst_base.cpp VstPlugin.cpp VstPlugin.h communication.h MOCFILES VstPlugin.h) -ELSE() - BUILD_PLUGIN(vstbase vst_base.cpp VstPlugin.cpp VstPlugin.h communication.h MOCFILES VstPlugin.h LINK SHARED) -ENDIF() +BUILD_PLUGIN(vstbase vst_base.cpp VstPlugin.cpp VstPlugin.h communication.h MOCFILES VstPlugin.h) IF(LMMS_BUILD_LINUX AND NOT WANT_VST_NOWINE)