From 513ae0030cb7e9548dcca13a521ce5b09f79cf0f Mon Sep 17 00:00:00 2001 From: Javier Serrano Polo Date: Sun, 12 Jan 2020 02:46:29 +0100 Subject: [PATCH 1/4] Build shared library instead of a module --- plugins/carlabase/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/carlabase/CMakeLists.txt b/plugins/carlabase/CMakeLists.txt index 49d7ad2651c..45ecff2796e 100644 --- a/plugins/carlabase/CMakeLists.txt +++ b/plugins/carlabase/CMakeLists.txt @@ -18,7 +18,7 @@ if(LMMS_HAVE_WEAKCARLA) ${CMAKE_CURRENT_BINARY_DIR} ) INCLUDE_DIRECTORIES(${CARLA_INCLUDE_DIRS}) - ADD_LIBRARY(carla_native-plugin MODULE DummyCarla.cpp) + ADD_LIBRARY(carla_native-plugin SHARED DummyCarla.cpp) INSTALL(TARGETS carla_native-plugin LIBRARY DESTINATION "${PLUGIN_DIR}/optional") SET(CARLA_LIBRARIES $) SET(CARLA_LIBRARY_DIRS $) From 1d3d589428fe31999443d69952f6d6030de336dc Mon Sep 17 00:00:00 2001 From: Javier Serrano Polo Date: Sun, 12 Jan 2020 03:07:46 +0100 Subject: [PATCH 2/4] Do not install in optional directory --- plugins/carlabase/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/carlabase/CMakeLists.txt b/plugins/carlabase/CMakeLists.txt index 45ecff2796e..0eed53dc097 100644 --- a/plugins/carlabase/CMakeLists.txt +++ b/plugins/carlabase/CMakeLists.txt @@ -19,7 +19,7 @@ if(LMMS_HAVE_WEAKCARLA) ) INCLUDE_DIRECTORIES(${CARLA_INCLUDE_DIRS}) ADD_LIBRARY(carla_native-plugin SHARED DummyCarla.cpp) - INSTALL(TARGETS carla_native-plugin LIBRARY DESTINATION "${PLUGIN_DIR}/optional") + INSTALL(TARGETS carla_native-plugin LIBRARY DESTINATION "${PLUGIN_DIR}") SET(CARLA_LIBRARIES $) SET(CARLA_LIBRARY_DIRS $) # Set parent scope variables so carlarack and carlapatchbay can see them From ca7c36d68c3188e0935f1be538f1f364ec774c59 Mon Sep 17 00:00:00 2001 From: Javier Serrano Polo Date: Sun, 12 Jan 2020 04:42:52 +0100 Subject: [PATCH 3/4] Use different link commands --- plugins/carlabase/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/carlabase/CMakeLists.txt b/plugins/carlabase/CMakeLists.txt index 0eed53dc097..74ac1c3d8a1 100644 --- a/plugins/carlabase/CMakeLists.txt +++ b/plugins/carlabase/CMakeLists.txt @@ -18,7 +18,7 @@ if(LMMS_HAVE_WEAKCARLA) ${CMAKE_CURRENT_BINARY_DIR} ) INCLUDE_DIRECTORIES(${CARLA_INCLUDE_DIRS}) - ADD_LIBRARY(carla_native-plugin SHARED DummyCarla.cpp) + ADD_LIBRARY(carla_native-plugin MODULE DummyCarla.cpp) INSTALL(TARGETS carla_native-plugin LIBRARY DESTINATION "${PLUGIN_DIR}") SET(CARLA_LIBRARIES $) SET(CARLA_LIBRARY_DIRS $) @@ -32,11 +32,12 @@ if(LMMS_HAVE_CARLA OR LMMS_HAVE_WEAKCARLA) INCLUDE(BuildPlugin) INCLUDE_DIRECTORIES(${CARLA_INCLUDE_DIRS}) LINK_DIRECTORIES(${CARLA_LIBRARY_DIRS}) - LINK_LIBRARIES(${CARLA_LIBRARIES}) BUILD_PLUGIN(carlabase carla.cpp carla.h MOCFILES carla.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png" LINK SHARED) SET_TARGET_PROPERTIES(carlabase PROPERTIES SKIP_BUILD_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE INSTALL_RPATH_USE_LINK_PATH TRUE INSTALL_RPATH "${CARLA_RPATH}") + TARGET_LINK_LIBRARIES(carlabase -lcarla_native-plugin) + ADD_DEPENDENCIES(carlabase carla_native-plugin) endif() From 2289fad47147edbbb3164d5e1c627b9887a21d57 Mon Sep 17 00:00:00 2001 From: Javier Serrano Polo Date: Sun, 12 Jan 2020 22:15:39 +0100 Subject: [PATCH 4/4] Keep the new dependency --- plugins/carlabase/CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/carlabase/CMakeLists.txt b/plugins/carlabase/CMakeLists.txt index 74ac1c3d8a1..722f8463da8 100644 --- a/plugins/carlabase/CMakeLists.txt +++ b/plugins/carlabase/CMakeLists.txt @@ -19,7 +19,7 @@ if(LMMS_HAVE_WEAKCARLA) ) INCLUDE_DIRECTORIES(${CARLA_INCLUDE_DIRS}) ADD_LIBRARY(carla_native-plugin MODULE DummyCarla.cpp) - INSTALL(TARGETS carla_native-plugin LIBRARY DESTINATION "${PLUGIN_DIR}") + INSTALL(TARGETS carla_native-plugin LIBRARY DESTINATION "${PLUGIN_DIR}/optional") SET(CARLA_LIBRARIES $) SET(CARLA_LIBRARY_DIRS $) # Set parent scope variables so carlarack and carlapatchbay can see them @@ -32,12 +32,14 @@ if(LMMS_HAVE_CARLA OR LMMS_HAVE_WEAKCARLA) INCLUDE(BuildPlugin) INCLUDE_DIRECTORIES(${CARLA_INCLUDE_DIRS}) LINK_DIRECTORIES(${CARLA_LIBRARY_DIRS}) + LINK_LIBRARIES(${CARLA_LIBRARIES}) BUILD_PLUGIN(carlabase carla.cpp carla.h MOCFILES carla.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png" LINK SHARED) SET_TARGET_PROPERTIES(carlabase PROPERTIES SKIP_BUILD_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE INSTALL_RPATH_USE_LINK_PATH TRUE INSTALL_RPATH "${CARLA_RPATH}") - TARGET_LINK_LIBRARIES(carlabase -lcarla_native-plugin) - ADD_DEPENDENCIES(carlabase carla_native-plugin) + IF(LMMS_HAVE_WEAKCARLA) + ADD_DEPENDENCIES(carlabase carla_native-plugin) + ENDIF() endif()