diff options
| author | Seth R. Johnson <johnsonsr@ornl.gov> | 2021-05-19 06:59:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-19 06:59:06 -0400 |
| commit | 3d2cd480486648cd60c2400b9771df34e7aca684 (patch) | |
| tree | c4cda21621fba37732020be3a10eb1b0df84c9eb /var/spack/repos/builtin/packages/chai/package.py | |
| parent | 33df3990de3dc89fcdbefd1cb4b8bfe0b316f43a (diff) | |
| download | spack-3d2cd480486648cd60c2400b9771df34e7aca684.tar.gz spack-3d2cd480486648cd60c2400b9771df34e7aca684.tar.bz2 spack-3d2cd480486648cd60c2400b9771df34e7aca684.tar.xz spack-3d2cd480486648cd60c2400b9771df34e7aca684.zip | |
Use define_from_variant in numerous CMakePackages (#23655)
Example replacement:
```
'-D(\w+)(:BOOL)?=\{0\}'\.\s*format\s*\(\s*'(ON|YES|true|TRUE)' if '\+(\w+)' in (self\.)?spec else '(OFF|NO|false|FALSE)'\)
```
with
```
self.define_from_variant('\1', '\4')
```
This will cause failures if any variants were misspelled: I have already caught two packages with nonexistent variants.
Diffstat (limited to 'var/spack/repos/builtin/packages/chai/package.py')
| -rw-r--r-- | var/spack/repos/builtin/packages/chai/package.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/chai/package.py b/var/spack/repos/builtin/packages/chai/package.py index edff6ed3b3..b284da358f 100644 --- a/var/spack/repos/builtin/packages/chai/package.py +++ b/var/spack/repos/builtin/packages/chai/package.py @@ -92,8 +92,7 @@ class Chai(CMakePackage, CudaPackage, ROCmPackage): options.extend(['-DENABLE_RAJA_PLUGIN=ON', '-DRAJA_DIR=' + spec['raja'].prefix]) - options.append('-DENABLE_PICK={0}'.format( - 'ON' if '+enable_pick' in spec else 'OFF')) + options.append(self.define_from_variant('ENABLE_PICK', 'enable_pick')) options.append('-Dumpire_DIR:PATH=' + spec['umpire'].prefix.share.umpire.cmake) @@ -101,10 +100,8 @@ class Chai(CMakePackage, CudaPackage, ROCmPackage): options.append('-DENABLE_TESTS={0}'.format( 'ON' if '+tests' in spec else 'OFF')) - options.append('-DENABLE_BENCHMARKS={0}'.format( - 'ON' if '+benchmarks' in spec else 'OFF')) + options.append(self.define_from_variant('ENABLE_BENCHMARKS', 'benchmarks')) - options.append('-DENABLE_EXAMPLES={0}'.format( - 'ON' if '+examples' in spec else 'OFF')) + options.append(self.define_from_variant('ENABLE_EXAMPLES', 'examples')) return options |