From bb9997f2ef108d2705b3dabe2b3dd227f20aee62 Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Sun, 23 Apr 2023 14:01:35 +0200
Subject: [PATCH] DDCad: test: use newer duck for newer assimp versions
---
examples/DDCAD/CMakeLists.txt | 5 +++++
examples/DDCAD/compact/Check_Shape_Collada_duck.xml.in | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/examples/DDCAD/CMakeLists.txt b/examples/DDCAD/CMakeLists.txt
index 78cff8bfd..dd04947c5 100644
--- a/examples/DDCAD/CMakeLists.txt
+++ b/examples/DDCAD/CMakeLists.txt
@@ -52,6 +52,11 @@ set(ClientTestsEx_INSTALL ${CMAKE_INSTALL_PREFIX}/examples/ClientTests)
# Single shape tests:
#Reference for test depends on assimp version
+if(assimp_VERSION VERSION_GREATER_EQUAL 5.2.0)
+ set(assimp_duck_VERSION 5.2.0)
+else()
+ set(assimp_duck_VERSION 5.0.0)
+endif()
configure_file(${CMAKE_CURRENT_LIST_DIR}/compact/Check_Shape_Collada_duck.xml.in
${CMAKE_CURRENT_LIST_DIR}/compact/Check_Shape_Collada_duck.xml @ONLY
)
diff --git a/examples/DDCAD/compact/Check_Shape_Collada_duck.xml.in b/examples/DDCAD/compact/Check_Shape_Collada_duck.xml.in
index 041976f46..234735fc7 100644
--- a/examples/DDCAD/compact/Check_Shape_Collada_duck.xml.in
+++ b/examples/DDCAD/compact/Check_Shape_Collada_duck.xml.in
@@ -20,7 +20,7 @@
<check vis="Shape1_vis">
<shape type="CAD_Shape" ref="${DD4hepExamplesINSTALL}/examples/DDCAD/models/Collada/duck.dae" mesh="0"/>
</check>
- <test type="DD4hep_Mesh_Verifier" ref="${DD4hepExamplesINSTALL}/examples/DDCAD/ref/Ref_Collada_duck.txt.@assimp_VERSION@" create="CheckShape_create"/>
+ <test type="DD4hep_Mesh_Verifier" ref="${DD4hepExamplesINSTALL}/examples/DDCAD/ref/Ref_Collada_duck.txt.@assimp_duck_VERSION@" create="CheckShape_create"/>
</detector>
</detectors>
</lccdd>
--
GitLab