summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarmen Stoppels <me@harmenstoppels.nl>2024-06-26 14:27:12 +0200
committerGitHub <noreply@github.com>2024-06-26 14:27:12 +0200
commit867a8133281c7ace0561707b7d7d872266afc3ae (patch)
tree54a4cba58f96209192cd3e0d5c8cdb1fb08b2486
parentded3fa50a3781804dc7000eed328ecc027750cb0 (diff)
downloadspack-867a8133281c7ace0561707b7d7d872266afc3ae.tar.gz
spack-867a8133281c7ace0561707b7d7d872266afc3ae.tar.bz2
spack-867a8133281c7ace0561707b7d7d872266afc3ae.tar.xz
spack-867a8133281c7ace0561707b7d7d872266afc3ae.zip
kallisto: simplify (#44862)
-rw-r--r--var/spack/repos/builtin/packages/kallisto/package.py22
1 files changed, 6 insertions, 16 deletions
diff --git a/var/spack/repos/builtin/packages/kallisto/package.py b/var/spack/repos/builtin/packages/kallisto/package.py
index b1c88ef280..8a7974a0c2 100644
--- a/var/spack/repos/builtin/packages/kallisto/package.py
+++ b/var/spack/repos/builtin/packages/kallisto/package.py
@@ -56,19 +56,9 @@ class Kallisto(CMakePackage):
# configure script.
# See https://github.com/spack/spack/issues/15274 and
# https://github.com/pachterlab/kallisto/issues/253
- @property
- def std_cmake_args(self):
- """Call the original std_cmake_args and then filter the verbose
- setting.
- """
- a = super().std_cmake_args
- if self.spec.satisfies("@0.44.0:"):
- args = [i for i in a if i != "-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"]
- if self.spec.satisfies("@0.46.2:"):
- args.append(self.define_from_variant("USE_HDF5", "hdf5"))
- if self.spec.satisifes("@0.50.1:"):
- args.append(self.define_from_variant("USE_BAM", "bam"))
- else:
- args = a
-
- return args
+ def cmake_args(self):
+ return [
+ self.define("CMAKE_VERBOSE_MAKEFILE", False),
+ self.define_from_variant("USE_HDF5", "hdf5"),
+ self.define_from_variant("USE_BAM", "bam"),
+ ]