From bb4e23a11593ce4716480b735ea99d8d0f9d827a Mon Sep 17 00:00:00 2001
From: Marko Petric <marko.petric@cern.ch>
Date: Tue, 3 May 2016 14:18:54 +0000
Subject: [PATCH] Make DD4hep relocatable again
---
.gitlab-ci.yml | 3 +++
cmake/DD4hepConfig.cmake.in | 6 ++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b15bf049..b16b4e44b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,6 +19,7 @@ slc6-gcc48:
- make install
- make test
- cd ../..
+ - rm -rf .git
- sshpass -p $CLICTEL_PASS rsync -arv -e ssh --delete . clictel@lxplus:/afs/cern.ch/eng/clic/software/DD4hep/x86_64-slc6-gcc48-opt
slc6-gcc49:
@@ -42,6 +43,7 @@ slc6-gcc49:
- make install
- make test
- cd ../..
+ - rm -rf .git
- sshpass -p $CLICTEL_PASS rsync -arv -e ssh --delete . clictel@lxplus:/afs/cern.ch/eng/clic/software/DD4hep/x86_64-slc6-gcc49-opt
centos7-gcc49:
@@ -65,4 +67,5 @@ centos7-gcc49:
- make install
- make test
- cd ../..
+ - rm -rf .git
- sshpass -p $CLICTEL_PASS rsync -arv -e ssh --delete . clictel@lxplus:/afs/cern.ch/eng/clic/software/DD4hep/x86_64-centos7-gcc49-opt
diff --git a/cmake/DD4hepConfig.cmake.in b/cmake/DD4hepConfig.cmake.in
index f49992728..f096877c1 100644
--- a/cmake/DD4hepConfig.cmake.in
+++ b/cmake/DD4hepConfig.cmake.in
@@ -13,10 +13,8 @@
# @author Jan Engels, Desy
##############################################################################
-#set ( DD4hep_DIR "$ENV{DD4hep_DIR}" )
-#set ( DD4hep_ROOT "$ENV{DD4hep_ROOT}" )
-set ( DD4hep_DIR "@CMAKE_INSTALL_PREFIX@" )
-set ( DD4hep_ROOT ${DD4hep_DIR} )
+set ( DD4hep_DIR "$ENV{DD4hep_DIR}" )
+set ( DD4hep_ROOT "$ENV{DD4hep_ROOT}" )
set ( DD4hep_VERSION "@DD4hep_VERSION@" )
set ( DD4HEP_USE_BOOST "@DD4HEP_USE_BOOST@" )
set ( DD4HEP_USE_GEANT4 "@DD4HEP_USE_GEANT4@" )
--
GitLab