summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorAxel Huebl <axel.huebl@plasma.ninja>2018-12-08 03:13:40 +0100
committerPeter Scheibel <scheibel1@llnl.gov>2018-12-07 18:13:40 -0800
commit892ae2043f00dae2cd371f150bee994c3e83e63a (patch)
tree23c69a840385eb315cd04a2452dcf12383c48bf5 /var
parent1650e9c0b27d1a56709c4b8a64a9dc13eb188fcf (diff)
downloadspack-892ae2043f00dae2cd371f150bee994c3e83e63a.tar.gz
spack-892ae2043f00dae2cd371f150bee994c3e83e63a.tar.bz2
spack-892ae2043f00dae2cd371f150bee994c3e83e63a.tar.xz
spack-892ae2043f00dae2cd371f150bee994c3e83e63a.zip
Fix Catch2 Single Header (#10022)
Fix the install of the single header amalgate in catch2. The public API for catch < 2.3.0 was "#include <catch.hpp>". For 2.3.0+ it is "#include <catch2/catch.hpp>"
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/catch/package.py5
1 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 0db27a853d..557f135bf7 100644
--- a/var/spack/repos/builtin/packages/catch/package.py
+++ b/var/spack/repos/builtin/packages/catch/package.py
@@ -63,6 +63,9 @@ class Catch(CMakePackage):
@when('+single_header')
def install(self, spec, prefix):
mkdirp(prefix.include)
- install(join_path('single_include', 'catch.hpp'), prefix.include)
+ if spec.satisfies('@2.3.0:'):
+ install_tree('single_include', prefix.include)
+ else:
+ install(join_path('single_include', 'catch.hpp'), prefix.include)
# fakes out spack so it installs a module file
mkdirp(join_path(prefix, 'bin'))