summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Perache <marc.perache@cea.fr>2023-11-20 11:31:17 +0100
committerGitHub <noreply@github.com>2023-11-20 11:31:17 +0100
commit73858df14dc3f0e701814c84bb8bd6b72f80a806 (patch)
treeed9d3e8cbda6faeb2d1a5fb91b54a1696b6bffeb
parent8003f187098d3c44121f94b8ce716a8eaa1a47c9 (diff)
downloadspack-73858df14dc3f0e701814c84bb8bd6b72f80a806.tar.gz
spack-73858df14dc3f0e701814c84bb8bd6b72f80a806.tar.bz2
spack-73858df14dc3f0e701814c84bb8bd6b72f80a806.tar.xz
spack-73858df14dc3f0e701814c84bb8bd6b72f80a806.zip
Catch2: add variant to choose cxx standard (#40996)
-rw-r--r--var/spack/repos/builtin/packages/catch2/package.py6
1 files changed, 5 insertions, 1 deletions
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"))