summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarmen Stoppels <harmenstoppels@gmail.com>2021-01-21 17:43:57 +0100
committerGitHub <noreply@github.com>2021-01-21 10:43:57 -0600
commit0cf0be588b638575c2f43f637ec0fc8268944a64 (patch)
tree277460e36ce3cba664b2768226bb05b56406bada
parent1ceab34fc8afce4e9c26342bb75d9c87db17635d (diff)
downloadspack-0cf0be588b638575c2f43f637ec0fc8268944a64.tar.gz
spack-0cf0be588b638575c2f43f637ec0fc8268944a64.tar.bz2
spack-0cf0be588b638575c2f43f637ec0fc8268944a64.tar.xz
spack-0cf0be588b638575c2f43f637ec0fc8268944a64.zip
Always set SPLA_OMP and SPLA_STATIC (#21195)
-rw-r--r--var/spack/repos/builtin/packages/spla/package.py15
1 files changed, 4 insertions, 11 deletions
diff --git a/var/spack/repos/builtin/packages/spla/package.py b/var/spack/repos/builtin/packages/spla/package.py
index 7e3125268a..bcf242f885 100644
--- a/var/spack/repos/builtin/packages/spla/package.py
+++ b/var/spack/repos/builtin/packages/spla/package.py
@@ -41,12 +41,10 @@ class Spla(CMakePackage):
depends_on('hsa-rocr-dev', when='+rocm', type='link')
def cmake_args(self):
- args = []
-
- if '+openmp' in self.spec:
- args += ["-DSPLA_OMP=ON"]
- else:
- args += ["-DSPLA_OMP=OFF"]
+ args = [
+ self.define_from_variant('SPLA_OMP', 'openmp'),
+ self.define_from_variant('SPLA_STATIC', 'static')
+ ]
if '+cuda' in self.spec:
args += ["-DSPLA_GPU_BACKEND=CUDA"]
@@ -55,11 +53,6 @@ class Spla(CMakePackage):
else:
args += ["-DSPLA_GPU_BACKEND=OFF"]
- if '+static' in self.spec:
- args += ["-DSPLA_STATIC=ON"]
- else:
- args += ["-DSPLA_STATIC=OFF"]
-
if self.spec['blas'].name == 'openblas':
args += ["-DSPLA_HOST_BLAS=OPENBLAS"]
elif self.spec['blas'].name in ['amdblis', 'blis']: