View Issue Details [ Jump to Notes ] | [ Issue History ] [ Print ] |
ID | Project | Category | View Status | Date Submitted | Last Update |
0000143 | openvibe | patch submission | public | 2013-10-30 16:52 | 2013-10-31 14:34 |
|
Reporter | ozan.caglayan | |
Assigned To | jtlindgr | |
Priority | normal | Severity | minor | Reproducibility | always |
Status | resolved | Resolution | fixed | |
Platform | x86_64 | OS | Linux | OS Version | Fedora |
|
Summary | 0000143: Make matlab plugin work correctly on Linux |
Description | 1. Setting LD_LIBRARY_PATH in linux-build was breaking the normal build as some libraries were found under matlab folder instead of the system-wide ones. Drop all MATLAB tricks from linux-build.
2. FindThirdPartyMatlab.cmake correctly finds matlab if "matlab" is in $PATH. The compilation and linking also works fine but CMake removes RPATH's from binaries upon installing. So currently matlab libraries can not be found even with the .sh runner scripts. Tweak CMake files for matlab plugin so that the RPATH for libmex.so is left inside the library.
Built and tested on F19 x86_64. Ran plugin-inspector, designer and acquisition-server and all loads the matlab plugin correctly.
Attached is the patch to fix the issue. |
Tags | No tags attached. |
|
Attached Files | matlab.patch [^] (1,052 bytes) 2013-10-30 16:52 [Show Content] [Hide Content]diff --git a/plugins/processing/matlab/CMakeLists.txt b/plugins/processing/matlab/CMakeLists.txt
index 03fd271..66ac58e 100644
--- a/plugins/processing/matlab/CMakeLists.txt
+++ b/plugins/processing/matlab/CMakeLists.txt
@@ -39,6 +39,8 @@ IF(UNIX)
ADD_DEFINITIONS(-DTARGET_OS_Linux)
ADD_DEFINITIONS(-DTARGET_ARCHITECTURE_i386)
ADD_DEFINITIONS(-DTARGET_COMPILER_GCC)
+ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
+ INSTALL_RPATH_USE_LINK_PATH TRUE)
ENDIF(UNIX)
# -----------------------------
diff --git a/scripts/linux-build b/scripts/linux-build
index 445ba00..5c1bd58 100755
--- a/scripts/linux-build
+++ b/scripts/linux-build
@@ -1,13 +1,5 @@
#!/bin/bash
-if [ "$MATLABROOT" == "" ]; then
- if [ "`which matlab`" != "" ] ; then
- export MATLABROOT=`matlab -e | grep "^MATLAB=" | sed "s/^MATLAB=//g"`
- export MATLABARCH=`matlab -e | grep "^ARCH=" | sed "s/^ARCH=//g"`
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MATLABROOT/bin/$MATLABARCH
- fi
-fi
-
ov_build_type=Release
if [ "$1" == "--debug" ]; then
ov_build_type=Debug
|
|