a8edb201f9
- Update upstream URL. - Rebase patches. - Add dependency on fltk-fluid. - Mark license with %license.
68 lines
3 KiB
Diff
68 lines
3 KiB
Diff
From: Thomas Moschny <thomas.moschny@gmx.de>
|
|
Subject: [PATCH] t/libexecdir
|
|
|
|
Move the vst and zynaddsubfx plugins to libexecdir.
|
|
|
|
Signed-off-by: Thomas Moschny <thomas.moschny@gmx.de>
|
|
|
|
---
|
|
CMakeLists.txt | 2 +-
|
|
plugins/vst_base/CMakeLists.txt | 2 +-
|
|
plugins/zynaddsubfx/CMakeLists.txt | 2 +-
|
|
src/core/RemotePlugin.cpp | 2 +-
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 63af96c..09b52bc 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -436,7 +436,7 @@ ENDIF()
|
|
# Paths relative to lmms executable
|
|
FILE(RELATIVE_PATH LIB_DIR_RELATIVE "/${BIN_DIR}" "/${LIB_DIR}")
|
|
FILE(RELATIVE_PATH PLUGIN_DIR_RELATIVE "/${BIN_DIR}" "/${PLUGIN_DIR}")
|
|
-ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR_RELATIVE}/"' -D'PLUGIN_DIR="${PLUGIN_DIR_RELATIVE}/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
|
|
+ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR_RELATIVE}/"' -D'PLUGIN_DIR="${PLUGIN_DIR_RELATIVE}/"' -D'LIBEXEC_DIR="${LIBEXEC_INSTALL_DIR}"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
|
|
INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}"
|
|
"${CMAKE_BINARY_DIR}/include"
|
|
"${CMAKE_SOURCE_DIR}"
|
|
diff --git a/plugins/vst_base/CMakeLists.txt b/plugins/vst_base/CMakeLists.txt
|
|
index 373604c..be2914f 100644
|
|
--- a/plugins/vst_base/CMakeLists.txt
|
|
+++ b/plugins/vst_base/CMakeLists.txt
|
|
@@ -42,7 +42,7 @@ ADD_CUSTOM_COMMAND(
|
|
)
|
|
|
|
SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES RemoteVstPlugin.exe.so)
|
|
-INSTALL(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/RemoteVstPlugin" "${CMAKE_CURRENT_BINARY_DIR}/RemoteVstPlugin.exe.so" DESTINATION "${PLUGIN_DIR}")
|
|
+INSTALL(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/RemoteVstPlugin" "${CMAKE_CURRENT_BINARY_DIR}/RemoteVstPlugin.exe.so" DESTINATION "${LIBEXEC_INSTALL_DIR}")
|
|
ENDIF(LMMS_BUILD_LINUX AND NOT WANT_VST_NOWINE)
|
|
|
|
|
|
diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt
|
|
index 8864804..f35485a 100644
|
|
--- a/plugins/zynaddsubfx/CMakeLists.txt
|
|
+++ b/plugins/zynaddsubfx/CMakeLists.txt
|
|
@@ -129,7 +129,7 @@ ENDIF(WIN32)
|
|
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}")
|
|
+INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION "${LIBEXEC_INSTALL_DIR}")
|
|
TARGET_LINK_LIBRARIES(RemoteZynAddSubFx zynaddsubfx_gui ZynAddSubFxCore ${FLTK_LIBRARIES} -lpthread )
|
|
|
|
# link Qt libraries when on win32
|
|
diff --git a/src/core/RemotePlugin.cpp b/src/core/RemotePlugin.cpp
|
|
index 023f683..5bce7a3 100644
|
|
--- a/src/core/RemotePlugin.cpp
|
|
+++ b/src/core/RemotePlugin.cpp
|
|
@@ -130,7 +130,7 @@ bool RemotePlugin::init( const QString &pluginExecutable,
|
|
reset( new shmFifo(), new shmFifo() );
|
|
m_failed = false;
|
|
}
|
|
- QString exec = configManager::inst()->pluginDir() +
|
|
+ QString exec = QString( LIBEXEC_DIR ) +
|
|
QDir::separator() + pluginExecutable;
|
|
|
|
QStringList args;
|
|
--
|
|
tg: (d14f451..) t/libexecdir (depends on: stable-1.1)
|