Fix new travis errors.
This commit is contained in:
parent
6646fe1b74
commit
7a5e806b7a
@ -69,11 +69,6 @@ def cmake_args(self):
|
||||
|
||||
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 = [
|
||||
'-DCBTF_DIR=%s' % spec['cbtf'].prefix,
|
||||
'-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix,
|
||||
|
@ -78,7 +78,8 @@ class Openspeedshop(CMakePackage):
|
||||
variant('cuda', default=False,
|
||||
description="build with cuda packages included.")
|
||||
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,
|
||||
description="build for clusters heterogeneous processors \
|
||||
on fe/be nodes.")
|
||||
@ -162,7 +163,6 @@ def cmake_args(self):
|
||||
self.adjustBuildTypeParams_cmakeOptions(spec, cmake_args)
|
||||
|
||||
else:
|
||||
cmake_prefix_path = join_path(spec['dyninst'].prefix)
|
||||
cmake_args = []
|
||||
|
||||
# Appends base options to cmake_args
|
||||
@ -191,9 +191,6 @@ def cmake_args(self):
|
||||
|
||||
elif '+cbtf' in spec:
|
||||
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:
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user