summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorvvolkl <valentin.volkl@cern.ch>2020-05-19 04:52:18 +0200
committerGitHub <noreply@github.com>2020-05-18 21:52:18 -0500
commit31ccf80294382a391743728a736574737217c23b (patch)
tree1c1d8511ce0bf46d080f5ef80a96bbfab3635c26 /var
parent9d766ae1fafec7a2c5321caaed70d835edcbd81a (diff)
downloadspack-31ccf80294382a391743728a736574737217c23b.tar.gz
spack-31ccf80294382a391743728a736574737217c23b.tar.bz2
spack-31ccf80294382a391743728a736574737217c23b.tar.xz
spack-31ccf80294382a391743728a736574737217c23b.zip
[podio] fix root cxxstd dependency (#16708)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/podio/package.py17
1 files changed, 6 insertions, 11 deletions
diff --git a/var/spack/repos/builtin/packages/podio/package.py b/var/spack/repos/builtin/packages/podio/package.py
index 14b4722cdb..488eaf54f1 100644
--- a/var/spack/repos/builtin/packages/podio/package.py
+++ b/var/spack/repos/builtin/packages/podio/package.py
@@ -26,17 +26,12 @@ class Podio(CMakePackage):
description='The build type to build',
values=('Debug', 'Release'))
- variant('cxxstd',
- default='17',
- values=('14', '17'),
- multi=False,
- description='Use the specified C++ standard when building.')
+ # cpack config throws an error on some systems
+ patch('cpack.patch', when="@:0.10.0")
- _cxxstd_values = ('14', '17')
- for s in _cxxstd_values:
- depends_on('root@6.08.06: cxxstd=' + s, when='cxxstd=' + s)
+ depends_on('root@6.08.06:')
- depends_on('cmake', type='build')
+ depends_on('cmake@3.8:', type='build')
depends_on('python', type=('build', 'run'))
depends_on('py-pyyaml', type=('build', 'run'))
@@ -44,8 +39,8 @@ class Podio(CMakePackage):
args = []
# C++ Standard
args.append('-DCMAKE_CXX_STANDARD=%s'
- % self.spec.variants['cxxstd'].value)
- args.append('-DBUILD_TESTING=OFF')
+ % self.spec['root'].variants['cxxstd'].value)
+ args.append('-DBUILD_TESTING=%s' % self.run_tests)
return args
def setup_build_environment(self, spack_env):