From 32f8dad0e24a1646d0162bc5b7644e210b2aace4 Mon Sep 17 00:00:00 2001 From: Martin Pokorny Date: Mon, 4 Oct 2021 18:34:03 -0600 Subject: log4cxx: new version and fix for c++11 (#26480) * Add version 0.12.1 * Add variant to build with C++11 standard build with c++11 standard requires boost threads, and needs explicit setting of CMAKE_CXX_STANDARD --- var/spack/repos/builtin/packages/log4cxx/package.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/log4cxx/package.py b/var/spack/repos/builtin/packages/log4cxx/package.py index 906b66be32..c416420e54 100644 --- a/var/spack/repos/builtin/packages/log4cxx/package.py +++ b/var/spack/repos/builtin/packages/log4cxx/package.py @@ -14,14 +14,21 @@ class Log4cxx(CMakePackage): maintainers = ['nicmcd'] + version('0.12.1', sha256='7bea5cb477f0e31c838f0e1f4f498cc3b30c2eae74703ddda923e7e8c2268d22') version('0.12.0', sha256='bd5b5009ca914c8fa7944b92ea6b4ca6fb7d146f65d526f21bf8b3c6a0520e44') + variant('cxxstd', default='17', description='C++ standard', + values=('11', '17'), multi=False) + depends_on('cmake@3.13:', type='build') depends_on('apr-util') depends_on('apr') + depends_on('boost+thread+system', when='cxxstd=11') depends_on('zlib') depends_on('zip') def cmake_args(self): - return [self.define('BUILD_TESTING', 'off')] + return [ + self.define_from_variant('CMAKE_CXX_STANDARD', 'cxxstd'), + self.define('BUILD_TESTING', 'off')] -- cgit v1.2.3-60-g2f50