Skip to content

Fix Debian sid builds #5372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasp00 merged 4 commits into from
Jan 12, 2020
Merged

Fix Debian sid builds #5372

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
513ae00
Build shared library instead of a module
jasp00 Jan 12, 2020
1d3d589
Do not install in optional directory
jasp00 Jan 12, 2020
ca7c36d
Use different link commands
jasp00 Jan 12, 2020
2289fad
Keep the new dependency
jasp00 Jan 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use different link commands
  • Loading branch information
@jasp00
jasp00 authored Jan 12, 2020
commit ca7c36d68c3188e0935f1be538f1f364ec774c59
5 changes: 3 additions & 2 deletions plugins/carlabase/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $<TARGET_FILE:carla_native-plugin>)
SET(CARLA_LIBRARY_DIRS $<TARGET_FILE_DIR:carla_native-plugin>)
Expand All @@ -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()