From 9035dc6b3ded135b368feccc83624ceb28897734 Mon Sep 17 00:00:00 2001 From: Aniruddha Marathe Date: Wed, 8 Apr 2020 20:13:13 -0700 Subject: - Fixes build issues. (#15951) - Updates Kripke URL to its Github repository. - Adds previous Kripke versions. - Adds 'caliper' variant. --- var/spack/repos/builtin/packages/kripke/package.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/kripke/package.py b/var/spack/repos/builtin/packages/kripke/package.py index 8a54f71d48..cd605fda3c 100644 --- a/var/spack/repos/builtin/packages/kripke/package.py +++ b/var/spack/repos/builtin/packages/kripke/package.py @@ -11,16 +11,22 @@ class Kripke(CMakePackage): transport proxy/mini app. """ homepage = "https://computing.llnl.gov/projects/co-design/kripke" - url = "https://computing.llnl.gov/projects/co-design/download/kripke-openmp-1.1.tar.gz" + git = "https://github.com/LLNL/Kripke.git" tags = ['proxy-app'] - version('1.1', sha256='232d74072fc7b848fa2adc8a1bc839ae8fb5f96d50224186601f55554a25f64a') + version('1.2.4', submodules=True, tag='v1.2.4') + version('1.2.3', submodules=True, tag='v1.2.3') + version('1.2.2', submodules=True, tag='v1.2.2-CORAL2') + version('1.2.1', submodules=True, tag='v1.2.1-CORAL2') + version('1.2.0', submodules=True, tag='v1.2.0-CORAL2') variant('mpi', default=True, description='Build with MPI.') variant('openmp', default=True, description='Build with OpenMP enabled.') + variant('caliper', default=False, description='Build with Caliper support enabled.') depends_on('mpi', when='+mpi') depends_on('cmake@3.0:', type='build') + depends_on('caliper', when='+caliper') def cmake_args(self): def enabled(variant): @@ -29,10 +35,11 @@ class Kripke(CMakePackage): return [ '-DENABLE_OPENMP=%d' % enabled('+openmp'), '-DENABLE_MPI=%d' % enabled('+mpi'), + '-DENABLE_CALIPER=%d' % enabled('+caliper'), ] def install(self, spec, prefix): # Kripke does not provide install target, so we have to copy # things into place. mkdirp(prefix.bin) - install('../spack-build/kripke', prefix.bin) + install('../spack-build/bin/kripke.exe', prefix.bin) -- cgit v1.2.3-70-g09d2