From 42af3c16bf57f3666ac94829556f500519f6f29a Mon Sep 17 00:00:00 2001 From: RĂ©mi Lacroix Date: Tue, 27 Apr 2021 01:58:12 +0200 Subject: GLM: Add version 0.9.9.8. (#22467) The CMake install target was removed in version 0.9.9.6 so update the package accordingly. --- var/spack/repos/builtin/packages/glm/package.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/glm/package.py b/var/spack/repos/builtin/packages/glm/package.py index 9ca1b74ce9..d54816fc50 100644 --- a/var/spack/repos/builtin/packages/glm/package.py +++ b/var/spack/repos/builtin/packages/glm/package.py @@ -12,8 +12,27 @@ class Glm(CMakePackage): """ homepage = "https://github.com/g-truc/glm" - url = "https://github.com/g-truc/glm/archive/0.9.7.1.tar.gz" + url = "https://github.com/g-truc/glm/archive/0.9.9.8.tar.gz" + version('0.9.9.8', sha256='7d508ab72cb5d43227a3711420f06ff99b0a0cb63ee2f93631b162bfe1fe9592') version('0.9.7.1', sha256='285a0dc8f762b4e523c8710fbd97accaace0c61f45bc8be2bdb0deed07b0e6f3') depends_on('cmake@2.6:', type='build') + depends_on('cmake@3.2:', type='build', when='@0.9.9.0:') + + # CMake install target was removed in version 0.9.9.6 + @when('@0.9.9.6:') + def cmake(self, spec, prefix): + pass + + @when('@0.9.9.6:') + def build(self, spec, prefix): + pass + + @when('@0.9.9.6:') + def install(self, spec, prefix): + mkdirp(prefix.include.glm) + ignore_cmakelists = lambda p: p.endswith('CMakeLists.txt') + install_tree('glm', prefix.include.glm, ignore=ignore_cmakelists) + mkdirp(prefix.lib64.cmake) + install_tree('cmake', prefix.lib64.cmake) -- cgit v1.2.3-70-g09d2