Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
e1a72e59
Commit
e1a72e59
authored
9 years ago
by
Harry Jeffery
Browse files
Options
Downloads
Plain Diff
Merge pull request #498 from mantidproject/11457_launch_scripts
Adding PV_PLUGIN_PATH to launch scripts.
parents
8b276ddc
9b70ccda
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Code/Mantid/Build/CMake/Packaging/launch_mantidplot.sh.in
+4
-0
4 additions, 0 deletions
Code/Mantid/Build/CMake/Packaging/launch_mantidplot.sh.in
Code/Mantid/Build/CMake/Packaging/mantidpython.in
+4
-0
4 additions, 0 deletions
Code/Mantid/Build/CMake/Packaging/mantidpython.in
with
8 additions
and
0 deletions
Code/Mantid/Build/CMake/Packaging/launch_mantidplot.sh.in
+
4
−
0
View file @
e1a72e59
...
...
@@ -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@
This diff is collapsed.
Click to expand it.
Code/Mantid/Build/CMake/Packaging/mantidpython.in
+
4
−
0
View file @
e1a72e59
...
...
@@ -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
...
...
@@ -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@
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment