From 4a0841608cc7efe738bd34a83b32a308fd271043 Mon Sep 17 00:00:00 2001 From: Frank Gaede <frank.gaede@desy.de> Date: Thu, 21 Apr 2016 12:14:22 +0000 Subject: [PATCH] - reverted changes from Marko for relocatability as these break ilcinstall ( if one wants to relocate DD4hep one only needs to change the one occurance of the path in the DD4hepConfig.cmake script) --- cmake/DD4hepConfig.cmake.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake/DD4hepConfig.cmake.in b/cmake/DD4hepConfig.cmake.in index f096877c1..f49992728 100644 --- a/cmake/DD4hepConfig.cmake.in +++ b/cmake/DD4hepConfig.cmake.in @@ -13,8 +13,10 @@ # @author Jan Engels, Desy ############################################################################## -set ( DD4hep_DIR "$ENV{DD4hep_DIR}" ) -set ( DD4hep_ROOT "$ENV{DD4hep_ROOT}" ) +#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_VERSION "@DD4hep_VERSION@" ) set ( DD4HEP_USE_BOOST "@DD4HEP_USE_BOOST@" ) set ( DD4HEP_USE_GEANT4 "@DD4HEP_USE_GEANT4@" ) -- GitLab