From ea97b37f60c83ab0ccd0297fc0c3fabf7c37aa9f Mon Sep 17 00:00:00 2001 From: Rao Garimella Date: Tue, 1 Sep 2020 13:18:24 -0600 Subject: Jali: Fix bugs in CMake section (#18447) Fix variant name and cmake variable. Co-authored-by: Rao Garimella --- var/spack/repos/builtin/packages/jali/package.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/jali/package.py b/var/spack/repos/builtin/packages/jali/package.py index 7c36ed7fdd..ef1f9f0a52 100644 --- a/var/spack/repos/builtin/packages/jali/package.py +++ b/var/spack/repos/builtin/packages/jali/package.py @@ -44,15 +44,11 @@ class Jali(CMakePackage): def cmake_args(self): options = [] - if '+with_mstk' in self.spec: - options.append('-DENABLE_MSTK_Mesh=ON') - else: - options.append('-DENABLE_MSTK_Mesh=OFF') + + # Turn MSTK ON/OFF + options.append(self.define_from_variant('ENABLE_MSTK_Mesh', 'mstk')) # Unit test variant - if self.run_tests: - options.append('-DENABLE_Tests=ON') - else: - options.append('-DENABLE_Tests=OFF') + options.append(self.define('ENABLE_TESTS', self.run_tests)) return options -- cgit v1.2.3-60-g2f50