From 8afa2d541276a3e7bfdb7a836b2567a73dd750d9 Mon Sep 17 00:00:00 2001 From: Hyunjin Song Date: Sat, 4 Apr 2020 12:06:35 +0900 Subject: [PATCH] Fix the linking method for the dummy Carla library --- plugins/carlabase/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/carlabase/CMakeLists.txt b/plugins/carlabase/CMakeLists.txt index 264780996..5e024da40 100644 --- a/plugins/carlabase/CMakeLists.txt +++ b/plugins/carlabase/CMakeLists.txt @@ -18,15 +18,15 @@ if(LMMS_HAVE_WEAKCARLA) ${CMAKE_CURRENT_SOURCE_DIR}/carla/source/backend ${CMAKE_CURRENT_BINARY_DIR}/autoconf ) - INCLUDE_DIRECTORIES(${CARLA_INCLUDE_DIRS}) - ADD_LIBRARY(carla_native-plugin MODULE DummyCarla.cpp) - INSTALL(TARGETS carla_native-plugin LIBRARY DESTINATION "${PLUGIN_DIR}/optional") - SET(CARLA_LIBRARIES $) - SET(CARLA_LIBRARY_DIRS $) + ADD_LIBRARY(carla_native-plugin SHARED DummyCarla.cpp) + TARGET_INCLUDE_DIRECTORIES(carla_native-plugin PUBLIC ${CARLA_INCLUDE_DIRS}) + INSTALL(TARGETS carla_native-plugin + LIBRARY DESTINATION "${PLUGIN_DIR}/optional" + RUNTIME DESTINATION "${PLUGIN_DIR}/optional" + ) + SET(CARLA_LIBRARIES carla_native-plugin) # Set parent scope variables so carlarack and carlapatchbay can see them SET(CARLA_LIBRARIES ${CARLA_LIBRARIES} PARENT_SCOPE) - SET(CARLA_INCLUDE_DIRS ${CARLA_INCLUDE_DIRS} PARENT_SCOPE) - SET(CARLA_LIBRARY_DIRS ${CARLA_LIBRARY_DIRS} PARENT_SCOPE) endif() if(LMMS_HAVE_CARLA OR LMMS_HAVE_WEAKCARLA)