summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Huebl <axel.huebl@plasma.ninja>2018-09-20 15:55:18 +0200
committerMassimiliano Culpo <massimiliano.culpo@gmail.com>2018-09-20 15:55:18 +0200
commit9e2ff95ec5ce62d7ed4e55168d313322930931d6 (patch)
tree43722757dd2a97bb81e9b74511fe3fc8df1b3312
parent95850a7a5e5a77f6543cdc8d8ee8265ad021489a (diff)
downloadspack-9e2ff95ec5ce62d7ed4e55168d313322930931d6.tar.gz
spack-9e2ff95ec5ce62d7ed4e55168d313322930931d6.tar.bz2
spack-9e2ff95ec5ce62d7ed4e55168d313322930931d6.tar.xz
spack-9e2ff95ec5ce62d7ed4e55168d313322930931d6.zip
Catch2: 2.3.0+ (#9300)
* Catch2: 2.3.0+ Add the latest two releases of Catch2. In 2.3.0+, the include changed to a future-proof `<catch2/catch.hpp>` path which dependent projects will break upon. * openPMD-api: Catch2 2.3.0+ openPMD-api just updated to use the new, future-proof Catch2 headers `<catch2/catch.hpp>`.
-rw-r--r--var/spack/repos/builtin/packages/catch/package.py3
-rw-r--r--var/spack/repos/builtin/packages/openpmd-api/package.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/catch/package.py b/var/spack/repos/builtin/packages/catch/package.py
index fdb8c09bd9..261b3952e5 100644
--- a/var/spack/repos/builtin/packages/catch/package.py
+++ b/var/spack/repos/builtin/packages/catch/package.py
@@ -39,6 +39,9 @@ class Catch(CMakePackage):
# - CMake config package was added in 2.1.2
conflicts('~single_header', when='@:1.6.1')
+ version('2.4.0', sha256='ab176de36b886a33aa745fcf34642eac853bf677bda518a88655dc750c72d756')
+ version('2.3.0', sha256='aaf6bbf81ce8522131bae2ea4d013a77b003bbb2017614f5872d5787687f8f5f')
+ # releases 2.3.0+ changed to "catch2/catch.hpp" header
version('2.2.1', '54e56803c84890636bd7fe6c3856b104')
version('2.1.0', '70b44068976d46d48f3cd8796f675691d3bc726b')
version('2.0.1', '5c191a031edebd0525640ed2f38cbf64bacb1803')
diff --git a/var/spack/repos/builtin/packages/openpmd-api/package.py b/var/spack/repos/builtin/packages/openpmd-api/package.py
index cfb77bfcf4..45fb7cbf26 100644
--- a/var/spack/repos/builtin/packages/openpmd-api/package.py
+++ b/var/spack/repos/builtin/packages/openpmd-api/package.py
@@ -50,7 +50,7 @@ class OpenpmdApi(CMakePackage):
depends_on('cmake@3.10.0:', type='build')
depends_on('mpark-variant@1.3.0:')
- depends_on('catch@2.2.1: ~single_header', type='test')
+ depends_on('catch@2.3.0: ~single_header', type='test')
depends_on('mpi@2.3:', when='+mpi') # might become MPI 3.0+
depends_on('hdf5@1.8.13:', when='+hdf5')
depends_on('hdf5@1.8.13: ~mpi', when='~mpi +hdf5')