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/spdlog/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/spdlog/package.py')
-rw-r--r-- | var/spack/repos/builtin/packages/spdlog/package.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/var/spack/repos/builtin/packages/spdlog/package.py b/var/spack/repos/builtin/packages/spdlog/package.py index a52096bd99..c6832c547d 100644 --- a/var/spack/repos/builtin/packages/spdlog/package.py +++ b/var/spack/repos/builtin/packages/spdlog/package.py @@ -42,19 +42,14 @@ class Spdlog(CMakePackage): depends_on('cmake@3.2:', type='build') def cmake_args(self): - spec = self.spec - args = [] if self.spec.version >= Version('1.4.0'): args.extend([ - '-DSPDLOG_BUILD_SHARED:BOOL={0}'.format( - 'ON' if '+shared' in spec else 'OFF'), + self.define_from_variant('SPDLOG_BUILD_SHARED', 'shared'), # tests and examples - '-DSPDLOG_BUILD_TESTS:BOOL={0}'.format( - 'ON' if self.run_tests else 'OFF'), - '-DSPDLOG_BUILD_EXAMPLE:BOOL={0}'.format( - 'ON' if self.run_tests else 'OFF') + self.define('SPDLOG_BUILD_TESTS', self.run_tests), + self.define('SPDLOG_BUILD_EXAMPLE', self.run_tests) ]) return args |