From b756b98f1fe13a79a8836314decb3a15d681db74 Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Fri, 5 Jul 2019 10:49:49 +0200
Subject: [PATCH] Fix issue https://github.com/AIDASoft/DD4hep/issues/521
---
DDCore/src/plugins/Compact2Objects.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/DDCore/src/plugins/Compact2Objects.cpp b/DDCore/src/plugins/Compact2Objects.cpp
index 99b9fef8e..68bf1de08 100644
--- a/DDCore/src/plugins/Compact2Objects.cpp
+++ b/DDCore/src/plugins/Compact2Objects.cpp
@@ -33,9 +33,13 @@
// Root/TGeo include files
#include "TGeoManager.h"
#include "TGeoMaterial.h"
+#if ROOT_VERSION_CODE >= ROOT_VERSION(6,12,0)
+#include "TGeoPhysicalConstants.h"
+#endif
#if ROOT_VERSION_CODE >= ROOT_VERSION(6,17,0)
#include "TGDMLMatrix.h"
#endif
+#include "TMath.h"
// C/C++ include files
#include <climits>
@@ -363,8 +367,7 @@ template <> void Converter<Header>::operator()(xml_h e) const {
h.setComment(e.child(_U(comment)).text());
description.setHeader(h);
}
-#include "TGeoPhysicalConstants.h"
-#include "TMath.h"
+
/** Convert compact material/element description objects
*
* Materials:
--
GitLab