diff options
author | Rao Garimella <rao@lanl.gov> | 2020-09-01 13:18:24 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-01 15:18:24 -0400 |
commit | ea97b37f60c83ab0ccd0297fc0c3fabf7c37aa9f (patch) | |
tree | 5f81e2f237ae9c4f9feebf1b9ddc417fd720fb46 | |
parent | e7f1eeb7af944f1977097b4da6e9a4c6e385c2fa (diff) | |
download | spack-ea97b37f60c83ab0ccd0297fc0c3fabf7c37aa9f.tar.gz spack-ea97b37f60c83ab0ccd0297fc0c3fabf7c37aa9f.tar.bz2 spack-ea97b37f60c83ab0ccd0297fc0c3fabf7c37aa9f.tar.xz spack-ea97b37f60c83ab0ccd0297fc0c3fabf7c37aa9f.zip |
Jali: Fix bugs in CMake section (#18447)
Fix variant name and cmake variable.
Co-authored-by: Rao Garimella <rao@abyzou.lanl.gov>
-rw-r--r-- | var/spack/repos/builtin/packages/jali/package.py | 12 |
1 files changed, 4 insertions, 8 deletions
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 |