Commit 465e6278 authored by Thomas Otahal's avatar Thomas Otahal
Browse files

COMP: Added rpath link when USE_MATLAB_MEX is On.

parent 47cc1be2
......@@ -254,7 +254,14 @@ ENDIF(VTK_USE_FFMPEG_ENCODER)
TARGET_LINK_LIBRARIES(vtkpython ${VTKPYTHON_LINK_LIBS})
SET_TARGET_PROPERTIES(vtkpython PROPERTIES LINK_FLAGS "${VTKPYTHON_LINK_FLAGS}")
IF(VTK_USE_MATLAB_MEX)
INCLUDE(${MATLAB_MEX_USE_FILE})
SET_TARGET_PROPERTIES(vtkpython PROPERTIES
LINK_FLAGS "${MEX_RPATH} ${VTKPYTHON_LINK_FLAGS}")
ELSE(VTK_USE_MATLAB_MEX)
SET_TARGET_PROPERTIES(vtkpython PROPERTIES LINK_FLAGS "${VTKPYTHON_LINK_FLAGS}")
ENDIF(VTK_USE_MATLAB_MEX)
SET(PVTKPYTHON_EXECUTABLE)
# Create the pvtkpython Python wrapper executable with MPI support.
......@@ -276,7 +283,13 @@ IF (VTK_USE_PARALLEL AND VTK_USE_MPI)
SET(PVTKPYTHON_EXECUTABLE pvtkpython)
ADD_EXECUTABLE(pvtkpython vtkParaPythonAppInit.cxx)
TARGET_LINK_LIBRARIES(pvtkpython ${VTKPYTHON_LINK_LIBS} ${MPI_LIBRARIES})
SET_TARGET_PROPERTIES(pvtkpython PROPERTIES LINK_FLAGS "${VTKPYTHON_LINK_FLAGS}")
IF(VTK_USE_MATLAB_MEX)
INCLUDE(${MATLAB_MEX_USE_FILE})
SET_TARGET_PROPERTIES(pvtkpython PROPERTIES
LINK_FLAGS "${MEX_RPATH} ${VTKPYTHON_LINK_FLAGS}")
ELSE(VTK_USE_MATLAB_MEX)
SET_TARGET_PROPERTIES(pvtkpython PROPERTIES LINK_FLAGS "${VTKPYTHON_LINK_FLAGS}")
ENDIF(VTK_USE_MATLAB_MEX)
IF(VTK_USE_CARBON AND VTK_APPLE_RESOURCE)
ADD_CUSTOM_COMMAND( TARGET pvtkpython POST_BUILD
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment