From f60fe1b3808ed363f387c0cb16d672543cd78dd8 Mon Sep 17 00:00:00 2001
From: Markus Frank <markus.frank@cern.ch>
Date: Mon, 29 Aug 2016 14:13:02 +0000
Subject: [PATCH] Try again....
---
DDDB/CMakeLists.txt | 9 +++++++++
examples/DDDB/CMakeLists.txt | 14 ++++++++++++--
examples/DDDB/scripts/extract_dddb.sh | 2 +-
3 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/DDDB/CMakeLists.txt b/DDDB/CMakeLists.txt
index f84128207..9a50fe698 100644
--- a/DDDB/CMakeLists.txt
+++ b/DDDB/CMakeLists.txt
@@ -9,8 +9,17 @@
# For the list of contributors see $DD4hepINSTALL/doc/CREDITS.
#
#==========================================================================
+#
+# DDDB is a detector description convention developed by the LHCb experiment.
+# For further information concerning the DTD, please see:
+# http://lhcb-comp.web.cern.ch/lhcb-comp/Frameworks/DetDesc/Documents/lhcbDtd.pdf
+# The usage of Xerces-C is mandatory due to the entity resolution mechanism
+#
+#=================================================================================
+
dd4hep_package( DDDB
USES DDCore DDCond
+ [XERCESC REQUIRED]
[BOOST REQUIRED COMPONENTS filesystem]
INCLUDE_DIRS include
INSTALL_INCLUDES include/DDDB)
diff --git a/examples/DDDB/CMakeLists.txt b/examples/DDDB/CMakeLists.txt
index 2ec2ec6f4..32e8e6529 100644
--- a/examples/DDDB/CMakeLists.txt
+++ b/examples/DDDB/CMakeLists.txt
@@ -8,6 +8,15 @@
# For the licensing terms see $DD4hepINSTALL/LICENSE.
# For the list of contributors see $DD4hepINSTALL/doc/CREDITS.
#
+#==========================================================================
+#
+# DDDB is a detector description convention developed by the LHCb experiment.
+# For further information concerning the DTD, please see:
+# http://lhcb-comp.web.cern.ch/lhcb-comp/Frameworks/DetDesc/Documents/lhcbDtd.pdf
+#
+# The usage of Xerces-C is mandatory due to the entity resolution mechanism
+#
+
#==========================================================================
cmake_minimum_required(VERSION 2.8.3 FATAL_ERROR)
include ( ${DD4hep_DIR}/cmake/DD4hep.cmake )
@@ -15,8 +24,9 @@ include ( ${DD4hep_DIR}/cmake/DD4hep.cmake )
#-----------------------------------------------------------------------------------
dd4hep_configure_output ()
dd4hep_package (DDDB MAJOR 0 MINOR 0 PATCH 1
- USES [ROOT REQUIRED COMPONENTS Geom]
- [DD4hep REQUIRED COMPONENTS DDCore DDDB]
+ USES [XERCESC REQUIRED]
+ [ROOT REQUIRED COMPONENTS Geom]
+ [DD4hep REQUIRED COMPONENTS DDCore DDDB]
)
#---Package installation procedure(s) -----------------------------------------
install ( PROGRAMS scripts/run_dddb.sh DESTINATION bin)
diff --git a/examples/DDDB/scripts/extract_dddb.sh b/examples/DDDB/scripts/extract_dddb.sh
index b22bfca43..01f9f72f7 100755
--- a/examples/DDDB/scripts/extract_dddb.sh
+++ b/examples/DDDB/scripts/extract_dddb.sh
@@ -23,7 +23,7 @@ if test -n "$USER"; then
else
target=/tmp;
fi;
-source=${DD4hepINSTALL}/examples/DDDB/data/DDDB.tar.gz;
+source=${DD4hepINSTALL}/examples/DDDB/DDDB.tar.gz;
clean="NO";
#
# Check for arguments:
--
GitLab