From 627416246b325fdb6531e3715d22aff7267b344d Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Mon, 30 Sep 2019 13:30:48 +0200
Subject: [PATCH] DDCore: Fix dictionary issue for missing DetectorImp
Move DetectorImp to normal include directory
rootcling still needs all header files that are included from other headers files available at runtime
This installed location is inside ROOT_INCLUDE_PATH
---
DDCore/CMakeLists.txt | 1 -
DDCore/{src => include/DD4hep}/DetectorImp.h | 0
DDCore/src/DetectorImp.cpp | 2 +-
DDCore/src/RootDictionary.h | 2 +-
DDCore/src/plugins/StandardPlugins.cpp | 2 +-
5 files changed, 3 insertions(+), 4 deletions(-)
rename DDCore/{src => include/DD4hep}/DetectorImp.h (100%)
diff --git a/DDCore/CMakeLists.txt b/DDCore/CMakeLists.txt
index d9544d497..b0e69b9b1 100644
--- a/DDCore/CMakeLists.txt
+++ b/DDCore/CMakeLists.txt
@@ -18,7 +18,6 @@ dd4hep_add_dictionary( G__DD4hep
include/DD4hep/*.h
include/DD4hep/detail/*.h
include/XML/*.h
- src/DetectorImp.h
src/RootDictionary.h
EXCLUDE include/DD4hep/DetFactoryHelper.h
include/DD4hep/Any.h
diff --git a/DDCore/src/DetectorImp.h b/DDCore/include/DD4hep/DetectorImp.h
similarity index 100%
rename from DDCore/src/DetectorImp.h
rename to DDCore/include/DD4hep/DetectorImp.h
diff --git a/DDCore/src/DetectorImp.cpp b/DDCore/src/DetectorImp.cpp
index 6b63f4718..ccb1a5ac5 100644
--- a/DDCore/src/DetectorImp.cpp
+++ b/DDCore/src/DetectorImp.cpp
@@ -23,7 +23,7 @@
#include "DD4hep/detail/DetectorInterna.h"
#include "DD4hep/detail/VolumeManagerInterna.h"
#include "DD4hep/detail/OpticalSurfaceManagerInterna.h"
-#include "DetectorImp.h"
+#include "DD4hep/DetectorImp.h"
// C/C++ include files
#include <iostream>
diff --git a/DDCore/src/RootDictionary.h b/DDCore/src/RootDictionary.h
index ab5039770..0fd6bfd36 100644
--- a/DDCore/src/RootDictionary.h
+++ b/DDCore/src/RootDictionary.h
@@ -36,7 +36,7 @@
#include "DD4hep/DetectorData.h"
#include "DD4hep/DetectorProcessor.h"
#include "DD4hep/ComponentProperties.h"
-#include "../src/DetectorImp.h"
+#include "DD4hep/DetectorImp.h"
// C/C++ include files
#include <vector>
diff --git a/DDCore/src/plugins/StandardPlugins.cpp b/DDCore/src/plugins/StandardPlugins.cpp
index 866c289d3..eb81f8cbe 100644
--- a/DDCore/src/plugins/StandardPlugins.cpp
+++ b/DDCore/src/plugins/StandardPlugins.cpp
@@ -13,6 +13,7 @@
// Framework include files
#include "DD4hep/Detector.h"
+#include "DD4hep/DetectorImp.h"
#include "DD4hep/Memory.h"
#include "DD4hep/DD4hepUI.h"
#include "DD4hep/Factories.h"
@@ -26,7 +27,6 @@
#include "XML/DocumentHandler.h"
#include "XML/XMLElements.h"
#include "XML/XMLTags.h"
-#include "../DetectorImp.h"
// ROOT includes
#include "TInterpreter.h"
--
GitLab