From 3fafbafab09967d55301b2f8c1879c5ee3b86d2f Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Tue, 10 Aug 2021 18:42:18 +0200 Subject: cxxopts: add v2.2.1 and clean package.py (#25334) --- var/spack/repos/builtin/packages/cxxopts/package.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/var/spack/repos/builtin/packages/cxxopts/package.py b/var/spack/repos/builtin/packages/cxxopts/package.py index ad0927727e..7a2f64e61e 100644 --- a/var/spack/repos/builtin/packages/cxxopts/package.py +++ b/var/spack/repos/builtin/packages/cxxopts/package.py @@ -11,7 +11,9 @@ class Cxxopts(CMakePackage): homepage = "https://github.com/jarro2783/cxxopts" url = "https://github.com/jarro2783/cxxopts/archive/v2.2.0.tar.gz" + maintainers = ['haampie'] + version('2.2.1', sha256='984aa3c8917d649b14d7f6277104ce38dd142ce378a9198ec926f03302399681') version('2.2.0', sha256='447dbfc2361fce9742c5d1c9cfb25731c977b405f9085a738fbd608626da8a4d') version('2.1.2', sha256='95f524c6615a2067e935e02ef74b013b17efa339df0a3c9db3e91fc0afbaf269') version('2.1.1', sha256='e19216251427d04f0273e6487c0246ae2dbb4154bf178f43896af8fa1ef89f3f') @@ -30,13 +32,9 @@ class Cxxopts(CMakePackage): depends_on('icu4c', when='+unicode') def cmake_args(self): - args = ['-DCXXOPTS_ENABLE_INSTALL=ON', - '-DCXXOPTS_BUILD_EXAMPLES=OFF', - '-DCXXOPTS_BUILD_TESTS=OFF'] - - if '+unicode' in self.spec: - args.append('-DCXXOPTS_USE_UNICODE_HELP=ON') - else: - args.append('-DCXXOPTS_USE_UNICODE_HELP=OFF') - - return args + return [ + self.define('CXXOPTS_ENABLE_INSTALL', 'ON'), + self.define('CXXOPTS_BUILD_EXAMPLES', 'OFF'), + self.define('CXXOPTS_BUILD_TESTS', 'OFF'), + self.define_from_variant('CXXOPTS_USE_UNICODE_HELP', 'unicode') + ] -- cgit v1.2.3-60-g2f50