From e644202ffa0d999ab9a12a63f7925915c72e8e03 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Sun, 26 Nov 2017 21:25:21 +0100 Subject: [PATCH] MSVC: Fix RemoteVstPlugin module path --- plugins/vst_base/CMakeLists.txt | 43 +++++++++++++++------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/plugins/vst_base/CMakeLists.txt b/plugins/vst_base/CMakeLists.txt index d4abef92b..a355f87ff 100644 --- a/plugins/vst_base/CMakeLists.txt +++ b/plugins/vst_base/CMakeLists.txt @@ -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()