Skip to content

Commit

Permalink
Re #11457. Adding PV_PLUGIN_PATH to launch scripts.
Browse files Browse the repository at this point in the history
  • Loading branch information
peterfpeterson committed Mar 31, 2015
1 parent 3573c13 commit 7566709
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions Code/Mantid/Build/CMake/Packaging/launch_mantidplot.sh.in
Expand Up @@ -20,7 +20,11 @@ else
TCM_RELEASE=${TCMALLOC_RELEASE_RATE}
fi

# Define paraview information
PV_PLUGIN_PATH="${INSTALLDIR}/pvplugins/pvplugins"

# Launch
LD_PRELOAD=${LOCAL_PRELOAD} TCMALLOC_RELEASE_RATE=${TCM_RELEASE} \
LD_LIBRARY_PATH=${LOCAL_LDPATH} QT_API=pyqt \
PV_PLUGIN_PATH=${PV_PLUGIN_PATH} \
@WRAPPER_PREFIX@$INSTALLDIR/@MANTIDPLOT_EXEC@ $*@WRAPPER_POSTFIX@
4 changes: 4 additions & 0 deletions Code/Mantid/Build/CMake/Packaging/mantidpython.in
Expand Up @@ -21,6 +21,9 @@ else
TCM_RELEASE=${TCMALLOC_RELEASE_RATE}
fi

# Define paraview information
PV_PLUGIN_PATH="${INSTALLDIR}/pvplugins/pvplugins"

# Define extra libraries for python
LOCAL_PYTHONPATH=@WRAPPER_PREFIX@$INSTALLDIR
if [ -n "${PYTHONPATH}" ]; then
Expand All @@ -30,5 +33,6 @@ fi
# Launch
LD_PRELOAD=${LOCAL_PRELOAD} TCMALLOC_RELEASE_RATE=${TCM_RELEASE} \
LD_LIBRARY_PATH=${LOCAL_LDPATH} QT_API=pyqt \
PV_PLUGIN_PATH=${PV_PLUGIN_PATH} \
PYTHONPATH=${LOCAL_PYTHONPATH} \
${IPYTHON} $*@WRAPPER_POSTFIX@

0 comments on commit 7566709

Please sign in to comment.