diff options
| author | Wouter Deconinck <wdconinc@gmail.com> | 2024-09-08 23:51:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-09 06:51:57 +0200 |
| commit | 47c771f03f9094da6f50e824fb0e12ac40f9a5c8 (patch) | |
| tree | 05f0e023ca9d3e6a67128b9766e22cff98037739 /var | |
| parent | c7139eb690131fa9b6d3bfb3f514b76b7a2b8e4d (diff) | |
| download | spack-47c771f03f9094da6f50e824fb0e12ac40f9a5c8.tar.gz spack-47c771f03f9094da6f50e824fb0e12ac40f9a5c8.tar.bz2 spack-47c771f03f9094da6f50e824fb0e12ac40f9a5c8.tar.xz spack-47c771f03f9094da6f50e824fb0e12ac40f9a5c8.zip | |
assimp: add v5.4.3, enable testing (#46267)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/assimp/package.py | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/var/spack/repos/builtin/packages/assimp/package.py b/var/spack/repos/builtin/packages/assimp/package.py index 9fd69d85b4..2e51f75e53 100644 --- a/var/spack/repos/builtin/packages/assimp/package.py +++ b/var/spack/repos/builtin/packages/assimp/package.py @@ -16,9 +16,10 @@ class Assimp(CMakePackage): maintainers("wdconinc") - license("BSD-3-Clause") + license("BSD-3-Clause", checked_by="wdconinc") version("master", branch="master") + version("5.4.3", sha256="66dfbaee288f2bc43172440a55d0235dfc7bf885dda6435c038e8000e79582cb") version("5.4.2", sha256="7414861a7b038e407b510e8b8c9e58d5bf8ca76c9dfe07a01d20af388ec5086a") version("5.4.0", sha256="a90f77b0269addb2f381b00c09ad47710f2aab6b1d904f5e9a29953c30104d3f") version("5.3.1", sha256="a07666be71afe1ad4bc008c2336b7c688aca391271188eb9108d0c6db1be53f1") @@ -32,9 +33,6 @@ class Assimp(CMakePackage): version("5.0.1", sha256="11310ec1f2ad2cd46b95ba88faca8f7aaa1efe9aa12605c55e3de2b977b3dbfc") version("4.0.1", sha256="60080d8ab4daaab309f65b3cffd99f19eb1af8d05623fff469b9b652818e286e") - depends_on("c", type="build") # generated - depends_on("cxx", type="build") # generated - patch( "https://patch-diff.githubusercontent.com/raw/assimp/assimp/pull/4203.patch?full_index=1", sha256="24135e88bcef205e118f7a3f99948851c78d3f3e16684104dc603439dd790d74", @@ -43,6 +41,9 @@ class Assimp(CMakePackage): variant("shared", default=True, description="Enables the build of shared libraries") + depends_on("c", type="build") + depends_on("cxx", type="build") + depends_on("cmake@3.10:", type="build", when="@5.1:") depends_on("cmake@3.22:", type="build", when="@5.4:") @@ -54,10 +55,10 @@ class Assimp(CMakePackage): def cmake_args(self): args = [ - "-DASSIMP_HUNTER_ENABLED=OFF", - "-DASSIMP_BUILD_ZLIB=OFF", - "-DASSIMP_BUILD_MINIZIP=OFF", - "-DASSIMP_BUILD_TESTS=OFF", + self.define("ASSIMP_HUNTER_ENABLED", False), + self.define("ASSIMP_BUILD_ZLIB", False), + self.define("ASSIMP_BUILD_MINIZIP", False), + self.define("ASSIMP_BUILD_TESTS", self.run_tests), self.define_from_variant("BUILD_SHARED_LIBS", "shared"), ] return args @@ -67,3 +68,12 @@ class Assimp(CMakePackage): if name == "cxxflags": flags.append(self.compiler.cxx11_flag) return (None, None, flags) + + def check(self): + unit = Executable(join_path(self.builder.build_directory, "bin", "unit")) + skipped_tests = [ + "AssimpAPITest_aiMatrix3x3.aiMatrix3FromToTest", + "AssimpAPITest_aiMatrix4x4.aiMatrix4FromToTest", + "AssimpAPITest_aiQuaternion.aiQuaternionFromNormalizedQuaternionTest", + ] + unit(f"--gtest_filter=-{':'.join(skipped_tests)}") |