Merge pull request #2732 from jasp00/master

Find vstbase library at runtime
This commit is contained in:
Tres Finocchiaro
2016-05-01 15:03:04 -04:00
2 changed files with 11 additions and 4 deletions

View File

@@ -1,8 +1,13 @@
IF(LMMS_SUPPORT_VST)
INCLUDE(BuildPlugin)
INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../vst_base")
LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/../vst_base")
LINK_LIBRARIES(vstbase)
LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/..")
IF(LMMS_BUILD_WIN32)
LINK_LIBRARIES(vstbase)
ELSE()
LINK_LIBRARIES(vstbase -Wl,--enable-new-dtags)
ENDIF()
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
# Enable C++11
ADD_DEFINITIONS(-std=c++0x)

View File

@@ -4,11 +4,13 @@ IF(LMMS_SUPPORT_VST)
INCLUDE(BuildPlugin)
INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../vst_base")
LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/../vst_base")
LINK_LIBRARIES(vstbase)
LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/..")
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
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()
ENDIF(LMMS_SUPPORT_VST)