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

Fix new travis errors.

Browse Source
This commit is contained in:
Jim Galarowicz 2017-07-19 08:58:19 -05:00
parent 6646fe1b74
commit 7a5e806b7a
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
var/spack/repos/builtin/packages/cbtf-lanl/package.py
View File

@ -69,11 +69,6 @@ def cmake_args(self):
spec = self.spec spec = self.spec
# Add in paths for finding package config files that tell us where to
# find these packages
cmake_prefix_path = join_path(
spec['cbtf'].prefix) + ':' + join_path(spec['cbtf-krell'].prefix)
cmake_args = [ cmake_args = [
'-DCBTF_DIR=%s' % spec['cbtf'].prefix, '-DCBTF_DIR=%s' % spec['cbtf'].prefix,
'-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix, '-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix,

7
var/spack/repos/builtin/packages/openspeedshop/package.py
View File

@ -78,7 +78,8 @@ class Openspeedshop(CMakePackage):
variant('cuda', default=False, variant('cuda', default=False,
description="build with cuda packages included.") description="build with cuda packages included.")
variant('useqt4gui', default=False, variant('useqt4gui', default=False,
description="build with Qt4/Qt5 based gui package enabled. Do not build older Qt3 gui") description="build with Qt4/Qt5 based gui package enabled. \
Do not build older Qt3 gui")
variant('rtfe', default=False, variant('rtfe', default=False,
description="build for clusters heterogeneous processors \ description="build for clusters heterogeneous processors \
on fe/be nodes.") on fe/be nodes.")
@ -162,7 +163,6 @@ def cmake_args(self):
self.adjustBuildTypeParams_cmakeOptions(spec, cmake_args) self.adjustBuildTypeParams_cmakeOptions(spec, cmake_args)
else: else:
cmake_prefix_path = join_path(spec['dyninst'].prefix)
cmake_args = [] cmake_args = []
# Appends base options to cmake_args # Appends base options to cmake_args
@ -191,9 +191,6 @@ def cmake_args(self):
elif '+cbtf' in spec: elif '+cbtf' in spec:
instrumentor_setting = "cbtf" instrumentor_setting = "cbtf"
cmake_prefix_path = join_path(spec['cbtf'].prefix) \
+ ':' + join_path(spec['cbtf-krell'].prefix)\
+ ':' + join_path(spec['dyninst'].prefix)
if '+runtime' in spec: if '+runtime' in spec: