zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qtgraph and cbtf-argonavis create proper library paths in modules (#8797)

Browse Source
This commit is contained in:
Jim Galarowicz 2018-08-17 17:58:08 -05:00 committed by Todd Gamblin
parent 99492dc910
commit a7a6745120
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py
View File

@ -41,6 +41,7 @@
##########################################################################
from spack import *
import os
class CbtfArgonavisGui(QMakePackage):
@ -107,10 +108,17 @@ def setup_environment(self, spack_env, run_env):
# The implementor of qtgraph has set up the library and include
# paths in a non-conventional way. We reflect that here.
# What library suffix should be used based on library existence
if os.path.isdir(self.spec['qtgraph'].prefix.lib64):
qtgraph_lib_dir = self.spec['qtgraph'].prefix.lib64
else:
qtgraph_lib_dir = self.spec['qtgraph'].prefix.lib
run_env.prepend_path(
'LD_LIBRARY_PATH', join_path(
self.spec['qtgraph'].prefix.lib64,
qtgraph_lib_dir,
'{0}'.format(self.spec['qt'].version.up_to(3))))
# The openspeedshop libraries are needed to actually load the
# performance information into the GUI.
run_env.prepend_path(

9
var/spack/repos/builtin/packages/qtgraph/package.py
View File

@ -40,6 +40,7 @@
# Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from spack import *
import os
class Qtgraph(QMakePackage):
@ -66,11 +67,17 @@ def setup_environment(self, spack_env, run_env):
spack_env.set('GRAPHVIZ_ROOT', self.spec['graphviz'].prefix)
spack_env.set('INSTALL_ROOT', self.prefix)
# What library suffix should be used based on library existence
if os.path.isdir(self.prefix.lib64):
lib_dir = self.prefix.lib64
else:
lib_dir = self.prefix.lib
# The implementor has set up the library and include paths in
# a non-conventional way. We reflect that here.
run_env.prepend_path(
'LD_LIBRARY_PATH', join_path(
self.prefix.lib64,
lib_dir,
'{0}'.format(self.spec['qt'].version.up_to(3))))
run_env.prepend_path('CPATH', self.prefix.include.QtGraph)