zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

assimp: add v5.4.3, enable testing (#46267)

Browse Source
This commit is contained in:
Wouter Deconinck 2024-09-08 23:51:57 -05:00 committed by GitHub
parent c7139eb690
commit 47c771f03f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
var/spack/repos/builtin/packages/assimp/package.py
View File

@ -16,9 +16,10 @@ class Assimp(CMakePackage):
maintainers("wdconinc") maintainers("wdconinc")
license("BSD-3-Clause") license("BSD-3-Clause", checked_by="wdconinc")
version("master", branch="master") version("master", branch="master")
version("5.4.3", sha256="66dfbaee288f2bc43172440a55d0235dfc7bf885dda6435c038e8000e79582cb")
version("5.4.2", sha256="7414861a7b038e407b510e8b8c9e58d5bf8ca76c9dfe07a01d20af388ec5086a") version("5.4.2", sha256="7414861a7b038e407b510e8b8c9e58d5bf8ca76c9dfe07a01d20af388ec5086a")
version("5.4.0", sha256="a90f77b0269addb2f381b00c09ad47710f2aab6b1d904f5e9a29953c30104d3f") version("5.4.0", sha256="a90f77b0269addb2f381b00c09ad47710f2aab6b1d904f5e9a29953c30104d3f")
version("5.3.1", sha256="a07666be71afe1ad4bc008c2336b7c688aca391271188eb9108d0c6db1be53f1") version("5.3.1", sha256="a07666be71afe1ad4bc008c2336b7c688aca391271188eb9108d0c6db1be53f1")
@ -32,9 +33,6 @@ class Assimp(CMakePackage):
version("5.0.1", sha256="11310ec1f2ad2cd46b95ba88faca8f7aaa1efe9aa12605c55e3de2b977b3dbfc") version("5.0.1", sha256="11310ec1f2ad2cd46b95ba88faca8f7aaa1efe9aa12605c55e3de2b977b3dbfc")
version("4.0.1", sha256="60080d8ab4daaab309f65b3cffd99f19eb1af8d05623fff469b9b652818e286e") version("4.0.1", sha256="60080d8ab4daaab309f65b3cffd99f19eb1af8d05623fff469b9b652818e286e")
depends_on("c", type="build") # generated
depends_on("cxx", type="build") # generated
patch( patch(
"https://patch-diff.githubusercontent.com/raw/assimp/assimp/pull/4203.patch?full_index=1", "https://patch-diff.githubusercontent.com/raw/assimp/assimp/pull/4203.patch?full_index=1",
sha256="24135e88bcef205e118f7a3f99948851c78d3f3e16684104dc603439dd790d74", sha256="24135e88bcef205e118f7a3f99948851c78d3f3e16684104dc603439dd790d74",
@ -43,6 +41,9 @@ class Assimp(CMakePackage):
variant("shared", default=True, description="Enables the build of shared libraries") 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.10:", type="build", when="@5.1:")
depends_on("cmake@3.22:", type="build", when="@5.4:") depends_on("cmake@3.22:", type="build", when="@5.4:")
@ -54,10 +55,10 @@ def patch(self):
def cmake_args(self): def cmake_args(self):
args = [ args = [
"-DASSIMP_HUNTER_ENABLED=OFF", self.define("ASSIMP_HUNTER_ENABLED", False),
"-DASSIMP_BUILD_ZLIB=OFF", self.define("ASSIMP_BUILD_ZLIB", False),
"-DASSIMP_BUILD_MINIZIP=OFF", self.define("ASSIMP_BUILD_MINIZIP", False),
"-DASSIMP_BUILD_TESTS=OFF", self.define("ASSIMP_BUILD_TESTS", self.run_tests),
self.define_from_variant("BUILD_SHARED_LIBS", "shared"), self.define_from_variant("BUILD_SHARED_LIBS", "shared"),
] ]
return args return args
@ -67,3 +68,12 @@ def flag_handler(self, name, flags):
if name == "cxxflags": if name == "cxxflags":
flags.append(self.compiler.cxx11_flag) flags.append(self.compiler.cxx11_flag)
return (None, None, flags) 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)}")