hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

MSVC: Fix RemoteVstPlugin module path

Browse Source
This commit is contained in:
Lukas W
2017-11-26 21:25:21 +01:00
parent e95a587993
commit e644202ffa
1 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
plugins/vst_base/CMakeLists.txt
View File

@@ -9,7 +9,19 @@ ADD_SUBDIRECTORY(vstbase)
SET(LMMS_BINARY_DIR ${CMAKE_BINARY_DIR})
SET(LMMS_SOURCE_DIR ${CMAKE_SOURCE_DIR})
SET(EXTERNALPROJECT_ARGS "")
SET(EXTERNALPROJECT_ARGS
SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/RemoteVstPlugin"
INSTALL_COMMAND ""
BUILD_ALWAYS ON
)
SET(EXTERNALPROJECT_CMAKE_ARGS
-DLMMS_SOURCE_DIR=${CMAKE_SOURCE_DIR}
-DLMMS_BINARY_DIR=${CMAKE_BINARY_DIR}
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}
)
# build 32 bit version of RemoteVstPlugin
IF(LMMS_BUILD_WIN64 AND MSVC)
@@ -33,32 +45,21 @@ IF(LMMS_BUILD_WIN64 AND MSVC)
ENDIF()
ExternalProject_Add(RemoteVstPlugin32
SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/RemoteVstPlugin"
INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/../"
${EXTERNALPROJECT_ARGS}
CMAKE_GENERATOR ${GENERATOR}
CMAKE_ARGS
-DLMMS_SOURCE_DIR=${CMAKE_SOURCE_DIR}
-DLMMS_BINARY_DIR=${CMAKE_BINARY_DIR}
${EXTERNALPROJECT_CMAKE_ARGS}
-DCMAKE_PREFIX_PATH=${QT_32_PREFIX}
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
INSTALL_COMMAND ""
BUILD_ALWAYS ON
)
ELSEIF(LMMS_BUILD_WIN32)
ADD_SUBDIRECTORY(RemoteVstPlugin)
ELSEIF(LMMS_BUILD_LINUX AND NOT WANT_VST_NOWINE)
ExternalProject_Add(RemoteVstPlugin32
SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/RemoteVstPlugin"
INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/../"
${EXTERNALPROJECT_ARGS}
CMAKE_ARGS
${EXTERNALPROJECT_CMAKE_ARGS}
-DCMAKE_CXX_COMPILER=${CMAKE_CURRENT_LIST_DIR}/RemoteVstPlugin/winegcc
-DLMMS_SOURCE_DIR=${CMAKE_SOURCE_DIR}
-DLMMS_BINARY_DIR=${CMAKE_BINARY_DIR}
-DCMAKE_CXX_FLAGS="-m32"
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}
INSTALL_COMMAND ""
BUILD_ALWAYS ON
)
ENDIF()
@@ -67,15 +68,9 @@ IF(LMMS_BUILD_WIN64)
ADD_SUBDIRECTORY(RemoteVstPlugin)
ELSEIF(LMMS_BUILD_LINUX AND NOT WANT_VST_NOWINE)
ExternalProject_Add(RemoteVstPlugin64
SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/RemoteVstPlugin"
INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/../"
${EXTERNALPROJECT_ARGS}
CMAKE_ARGS
${EXTERNALPROJECT_CMAKE_ARGS}
-DCMAKE_CXX_COMPILER=${CMAKE_CURRENT_LIST_DIR}/RemoteVstPlugin/winegcc
-DLMMS_SOURCE_DIR=${CMAKE_SOURCE_DIR}
-DLMMS_BINARY_DIR=${CMAKE_BINARY_DIR}
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}
INSTALL_COMMAND ""
BUILD_ALWAYS ON
)
ENDIF()