From 20f2ee99bcf551f9770a53fe2cf75e2988aa896b Mon Sep 17 00:00:00 2001 From: Peter Brady Date: Mon, 24 Jan 2022 01:47:43 -0700 Subject: glm: add develop version (#28499) * Add a new version to track development The released versions do not properly install via cmake which leads to errors when linking against the library. These upstream problems have been addressed on the glm development branch. * Move git to class level and remove redundant depends --- var/spack/repos/builtin/packages/glm/package.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/glm/package.py b/var/spack/repos/builtin/packages/glm/package.py index 9a09e4353b..23dcb4a5f4 100644 --- a/var/spack/repos/builtin/packages/glm/package.py +++ b/var/spack/repos/builtin/packages/glm/package.py @@ -13,7 +13,9 @@ class Glm(CMakePackage): homepage = "https://github.com/g-truc/glm" url = "https://github.com/g-truc/glm/archive/0.9.9.8.tar.gz" + git = "https://github.com/g-truc/glm.git" + version('develop', branch="master") version('0.9.9.8', sha256='7d508ab72cb5d43227a3711420f06ff99b0a0cb63ee2f93631b162bfe1fe9592') version('0.9.7.1', sha256='285a0dc8f762b4e523c8710fbd97accaace0c61f45bc8be2bdb0deed07b0e6f3') @@ -21,18 +23,24 @@ class Glm(CMakePackage): 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:') + @when('@0.9.9.6:0.9.9.8') def cmake(self, spec, prefix): pass - @when('@0.9.9.6:') + @when('@0.9.9.6:0.9.9.8') def build(self, spec, prefix): pass - @when('@0.9.9.6:') + @when('@0.9.9.6:0.9.9.8') 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) + + @when('@develop') + def cmake_args(self): + return [ + self.define('GLM_TEST_ENABLE', self.run_tests) + ] -- cgit v1.2.3-60-g2f50