From a7ee72708adeb4d61c7d6afc95347b091e6e9ba5 Mon Sep 17 00:00:00 2001 From: Auriane R <48684432+aurianer@users.noreply.github.com> Date: Wed, 20 Sep 2023 17:28:25 +0200 Subject: Add support for C++23 in pika and pika-algorithms packages (#40078) * Add C++23 support for pika * Add C++23 support for pika-algorithms as well --- var/spack/repos/builtin/packages/pika-algorithms/package.py | 3 ++- var/spack/repos/builtin/packages/pika/package.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/pika-algorithms/package.py b/var/spack/repos/builtin/packages/pika-algorithms/package.py index 2356537a5f..3387dfdb27 100644 --- a/var/spack/repos/builtin/packages/pika-algorithms/package.py +++ b/var/spack/repos/builtin/packages/pika-algorithms/package.py @@ -25,7 +25,7 @@ class PikaAlgorithms(CMakePackage): generator("ninja") map_cxxstd = lambda cxxstd: "2a" if cxxstd == "20" else cxxstd - cxxstds = ("17", "20") + cxxstds = ("17", "20", "23") variant( "cxxstd", default="17", @@ -39,6 +39,7 @@ class PikaAlgorithms(CMakePackage): conflicts("%gcc@:8") conflicts("%clang@:8") + conflicts("cxxstd=23", when="^cmake@:3.20.2") # Other dependencies depends_on("boost@1.71:") diff --git a/var/spack/repos/builtin/packages/pika/package.py b/var/spack/repos/builtin/packages/pika/package.py index 7321aefc61..35a0436bce 100644 --- a/var/spack/repos/builtin/packages/pika/package.py +++ b/var/spack/repos/builtin/packages/pika/package.py @@ -41,7 +41,7 @@ class Pika(CMakePackage, CudaPackage, ROCmPackage): generator("ninja") map_cxxstd = lambda cxxstd: "2a" if cxxstd == "20" else cxxstd - cxxstds = ("17", "20") + cxxstds = ("17", "20", "23") variant( "cxxstd", default="17", @@ -88,6 +88,7 @@ class Pika(CMakePackage, CudaPackage, ROCmPackage): conflicts("%gcc@:8", when="@0.2:") conflicts("%clang@:8", when="@0.2:") conflicts("+stdexec", when="cxxstd=17") + conflicts("cxxstd=23", when="^cmake@:3.20.2") # Other dependencies depends_on("boost@1.71:") -- cgit v1.2.3-60-g2f50