From 1aea4028bc7b0032de508c011ffcdcead9f7a3eb Mon Sep 17 00:00:00 2001
From: Markus Frank <markus.frank@cern.ch>
Date: Wed, 5 Aug 2015 14:49:12 +0000
Subject: [PATCH] New attempt to fix DD4hepExamples in nightly builds.
---
cmake/DD4hepBuild.cmake | 5 +++--
cmake/DD4hepConfig.cmake.in | 18 ++++++++++--------
doc/CompileAllOptionPermutations.sh | 12 +++++++-----
3 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/cmake/DD4hepBuild.cmake b/cmake/DD4hepBuild.cmake
index e8d3f1845..e3fb5f968 100644
--- a/cmake/DD4hepBuild.cmake
+++ b/cmake/DD4hepBuild.cmake
@@ -745,9 +745,10 @@ function( dd4hep_package packageName )
endforeach()
if ( NOT "${missing_uses}" STREQUAL "" )
- dd4hep_skipmsg ( "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++")
+ dd4hep_print ( "+-------------------------------------------------------------------------" )
+ dd4hep_skipmsg ( "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" )
dd4hep_skipmsg ( "PACKAGE ${packageName} / ${PKG_NAME} SKIPPED! Missing dependency: ${missing_uses}" )
- dd4hep_skipmsg ( "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++")
+ dd4hep_skipmsg ( "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" )
set ( use "OFF" )
set_property ( GLOBAL PROPERTY DD4HEP_USE_${PKG_NAME} ${use} )
else()
diff --git a/cmake/DD4hepConfig.cmake.in b/cmake/DD4hepConfig.cmake.in
index 8415429e3..1cb475a45 100644
--- a/cmake/DD4hepConfig.cmake.in
+++ b/cmake/DD4hepConfig.cmake.in
@@ -13,16 +13,18 @@
# @author Jan Engels, Desy
##############################################################################
-set ( DD4hep_DIR "@CMAKE_INSTALL_PREFIX@" )
-set ( DD4hep_ROOT "@CMAKE_INSTALL_PREFIX@" )
-set ( DD4hep_VERSION "@DD4hep_VERSION@" )
-set ( DD4HEP_USE_BOOST "@DD4HEP_USE_BOOST@" )
-set ( DD4HEP_USE_GEANT4 "@DD4HEP_USE_GEANT4@" )
+set ( DD4hep_DIR "@CMAKE_INSTALL_PREFIX@" )
+set ( DD4hep_ROOT "@CMAKE_INSTALL_PREFIX@" )
+set ( DD4hep_VERSION "@DD4hep_VERSION@" )
+set ( DD4HEP_USE_BOOST "@DD4HEP_USE_BOOST@" )
+set ( DD4HEP_USE_GEANT4 "@DD4HEP_USE_GEANT4@" )
set ( DD4HEP_USE_XERCESC "@DD4HEP_USE_XERCESC@" )
-set ( DD4HEP_USE_CXX11 "@DD4HEP_USE_CXX11@" )
+set ( DD4HEP_USE_CXX11 "@DD4HEP_USE_CXX11@" )
+set ( Geant4_DIR "@Geant4_DIR@" )
+set ( GEANT4_USE_CLHEP "@GEANT4_USE_CLHEP@" )
+
+set ( ROOT_DIR "@ROOTSYS@/cmake" )
set ( ROOT_VERSION_MAJOR "@ROOT_VERSION_MAJOR@" )
-set ( Geant4_DIR "@Geant4_DIR@" )
-set ( GEANT4_USE_CLHEP "@GEANT4_USE_CLHEP@" )
include ( ${DD4hep_DIR}/cmake/DD4hep.cmake )
diff --git a/doc/CompileAllOptionPermutations.sh b/doc/CompileAllOptionPermutations.sh
index 1bf52aa16..c52a7707a 100755
--- a/doc/CompileAllOptionPermutations.sh
+++ b/doc/CompileAllOptionPermutations.sh
@@ -2,6 +2,8 @@ dir_name=`pwd`;
INSTALL_G4=/home/frankm/SW/g4_10.01.p02_dbg/lib/Geant4-10.1.2;
INSTALL_LCIO=/home/frankm/SW/lcio/v02-04-03;
INSTALL_XERCESC=/home/frankm/SW/xercesc;
+CHECKOUT=${dir_name}/../../DD4hep.trunk/checkout;
+
export ROOTSYS=/home/frankm/SW/root_v5.34.25_dbg;
. ${ROOTSYS}/bin/thisroot.sh;
#
@@ -65,15 +67,15 @@ for DOGEANT4 in OFF ON; do
cd ${WORK_DIR};
make_output;
#-DDD4HEP_DEBUG_CMAKE=ON \
- DD4hep_DIR=`pwd`/DD4hep;
+ unset DD4hep_DIR;
OPTS="`make_opt ${DOGEANT4} -DDD4HEP_USE_GEANT4 -DGeant4_DIR=${INSTALL_G4}`\
`make_opt ${DOLCIO} -DDD4HEP_USE_LCIO -DLCIO_DIR=${INSTALL_LCIO}` \
`make_opt ${DOXERCESC} -DDD4HEP_USE_XERCESC -DXERCESC_ROOT_DIR=${INSTALL_XERCESC}` \
- -DCMAKE_INSTALL_PREFIX=${DD4hep_DIR}";
- CMD="cd ${dir_name}/$folder ; cmake ${OPTS} ../../../DD4hep.trunk/checkout;";
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/DD4hep";
+ CMD="cd ${dir_name}/$folder ; cmake ${OPTS} ${CHECKOUT};";
make_build;
- CMD="cd ${WORK_DIR}/EX; cmake ${OPTS} -DDD4hep_DIR=${DD4hep_DIR} \
- ../../../../DD4hep.trunk/checkout/examples;";
+ DD4hep_DIR=${WORK_DIR}/DD4hep;
+ CMD="cd ${WORK_DIR}/EX; cmake ${OPTS} -DDD4hep_DIR=${DD4hep_DIR} ${CHECKOUT}/examples;";
make_build;
#
cd ../..;
--
GitLab