From 73858df14dc3f0e701814c84bb8bd6b72f80a806 Mon Sep 17 00:00:00 2001
From: Marc Perache <marc.perache@cea.fr>
Date: Mon, 20 Nov 2023 11:31:17 +0100
Subject: Catch2: add variant to choose cxx standard (#40996)
---
var/spack/repos/builtin/packages/catch2/package.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
(limited to 'var')
diff --git a/var/spack/repos/builtin/packages/catch2/package.py b/var/spack/repos/builtin/packages/catch2/package.py
index 82eb629bb8..001d5151a1 100644
--- a/var/spack/repos/builtin/packages/catch2/package.py
+++ b/var/spack/repos/builtin/packages/catch2/package.py
@@ -110,9 +110,13 @@ class Catch2(CMakePackage):
)
variant("shared", when="@3:", default=False, description="Build shared library")
+ variant(
+ "cxxstd", default="14", values=("14", "17"), multi=False, description="Define C++ standard"
+ )
+
def cmake_args(self):
spec = self.spec
- args = []
+ args = [self.define_from_variant("CMAKE_CXX_STANDARD", "cxxstd")]
# 1.7.0-1.9.3: no control over test builds
if spec.satisfies("@1.9.4:2.1.0"):
args.append("-DNO_SELFTEST={0}".format("OFF" if self.run_tests else "ON"))
--
cgit v1.2.3-70-g09d2