diff options
| author | Auriane R <48684432+aurianer@users.noreply.github.com> | 2023-09-20 17:28:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-20 09:28:25 -0600 |
| commit | a7ee72708adeb4d61c7d6afc95347b091e6e9ba5 (patch) | |
| tree | cf1a064748594506eac7344fc16a2a3a7d7aa441 | |
| parent | c4a53cf3765258e140378326b619d5c908ee614b (diff) | |
| download | spack-a7ee72708adeb4d61c7d6afc95347b091e6e9ba5.tar.gz spack-a7ee72708adeb4d61c7d6afc95347b091e6e9ba5.tar.bz2 spack-a7ee72708adeb4d61c7d6afc95347b091e6e9ba5.tar.xz spack-a7ee72708adeb4d61c7d6afc95347b091e6e9ba5.zip | |
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
| -rw-r--r-- | var/spack/repos/builtin/packages/pika-algorithms/package.py | 3 | ||||
| -rw-r--r-- | 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:") |