summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--var/spack/repos/builtin/packages/caliper/package.py34
1 files changed, 23 insertions, 11 deletions
diff --git a/var/spack/repos/builtin/packages/caliper/package.py b/var/spack/repos/builtin/packages/caliper/package.py
index 11450f478d..9d45640eb1 100644
--- a/var/spack/repos/builtin/packages/caliper/package.py
+++ b/var/spack/repos/builtin/packages/caliper/package.py
@@ -20,12 +20,15 @@ class Caliper(CMakePackage):
git = "https://github.com/LLNL/Caliper.git"
version('master')
+ version('2.0.1', tag='v2.0.1')
+ version('1.9.1', tag='v1.9.1')
+ version('1.9.0', tag='v1.9.0')
+ version('1.8.0', tag='v1.8.0')
version('1.7.0', tag='v1.7.0')
- # version 1.6.0 is broken b/c it downloads the wrong gotcha version
- version('1.6.0', tag='v1.6.0')
is_linux = sys.platform.startswith('linux')
-
+ variant('shared', default=True,
+ description='Build shared libraries')
variant('mpi', default=True,
description='Enable MPI wrappers')
variant('dyninst', default=False,
@@ -46,23 +49,33 @@ class Caliper(CMakePackage):
variant('sosflow', default=False,
description='Enable SOSflow support')
- depends_on('gotcha@1.0:', when='+gotcha')
- depends_on('dyninst', when='+dyninst')
- depends_on('papi', when='+papi')
- depends_on('libpfm4', when='+libpfm')
+ depends_on('gotcha@1.0.2:1.0.99', when='+gotcha')
+
+ depends_on('dyninst@9.3.0:9.99', when='@:1.99 +dyninst')
+ depends_on('dyninst@10.0:10.99', when='@2: +dyninst')
+
+ depends_on('papi@5.3:5.99', when='+papi')
+
+ depends_on('libpfm4@4.8:4.99', when='+libpfm')
+
depends_on('mpi', when='+mpi')
- depends_on('unwind', when='+callpath')
- depends_on('sosflow', when='+sosflow')
+ depends_on('unwind@2018.10.12,1.2:1.99', when='+callpath')
+
+ depends_on('sosflow@spack', when='@1.0:1.99+sosflow')
depends_on('cmake', type='build')
depends_on('python', type='build')
+ # sosflow support not yet in 2.0
+ conflicts('+sosflow', '@2.0.0:2.0.99')
+
def cmake_args(self):
spec = self.spec
args = [
'-DBUILD_TESTING=Off',
'-DBUILD_DOCS=Off',
+ '-DBUILD_SHARED_LIBS=%s' % ('On' if '+shared' in spec else 'Off'),
'-DWITH_DYNINST=%s' % ('On' if '+dyninst' in spec else 'Off'),
'-DWITH_CALLPATH=%s' % ('On' if '+callpath' in spec else 'Off'),
'-DWITH_GOTCHA=%s' % ('On' if '+gotcha' in spec else 'Off'),
@@ -70,8 +83,7 @@ class Caliper(CMakePackage):
'-DWITH_LIBPFM=%s' % ('On' if '+libpfm' in spec else 'Off'),
'-DWITH_SOSFLOW=%s' % ('On' if '+sosflow' in spec else 'Off'),
'-DWITH_SAMPLER=%s' % ('On' if '+sampler' in spec else 'Off'),
- '-DWITH_MPI=%s' % ('On' if '+mpi' in spec else 'Off'),
- '-DWITH_MPIT=%s' % ('On' if spec.satisfies('^mpi@3:') else 'Off')
+ '-DWITH_MPI=%s' % ('On' if '+mpi' in spec else 'Off')
]
if '+gotcha' in spec: