Deduce CLHEP location from CLHEP_INCLUDE_DIR

.gitlab-ci.yml

@@ -57,10 +57,11 @@ slc6-gcc7-Geant10.3-XERCESC:
   image: clicdp/slc6-base
   script:
     - export COMPILER_TYPE="gcc"
+    - export GEANT4_VERSION="10.04"
     - source .dd4hep-ci.d/init_x86_64.sh
     - mkdir build
     - cd build
-    - cmake -GNinja -DDD4HEP_USE_GEANT4=ON -DBoost_NO_BOOST_CMAKE=ON -DDD4HEP_USE_LCIO=ON -DBUILD_TESTING=ON -DGeant4_DIR=$G4INSTALL/lib64/Geant4-10.3.3 -DCMAKE_CXX_STANDARD=14 -DCMAKE_BUILD_TYPE=Release -DDD4HEP_USE_XERCESC=ON -DXERCESC_ROOT_DIR=${XercesC_HOME} -DROOT_DIR=$ROOTSYS ..
+    - cmake -GNinja -DDD4HEP_USE_GEANT4=ON -DBoost_NO_BOOST_CMAKE=ON -DDD4HEP_USE_LCIO=ON -DBUILD_TESTING=ON -DGeant4_DIR=$G4INSTALL/lib64/Geant4-10.4.0 -DCMAKE_CXX_STANDARD=14 -DCMAKE_BUILD_TYPE=Release -DDD4HEP_USE_XERCESC=ON -DXERCESC_ROOT_DIR=${XercesC_HOME} -DROOT_DIR=$ROOTSYS ..
     - ninja
     - ninja install
     - . ../bin/thisdd4hep.sh

cmake/thisdd4hep.sh

@@ -92,9 +92,9 @@ if [ ${Geant4_DIR} ]; then
     if [ @GEANT4_USE_CLHEP@ ] ; then
 	dd4hep_add_library_path @CLHEP_LIBRARY_PATH@;
     fi;
-    export CLHEP_DIR=@CLHEP_ROOT_DIR@;
-    export CLHEP_ROOT_DIR=@CLHEP_ROOT_DIR@;
-    export CLHEP_LIBRARY_PATH=@CLHEP_LIBRARY_PATH@;
+    export CLHEP_DIR=@CLHEP_INCLUDE_DIR@/../;
+    export CLHEP_ROOT_DIR=@CLHEP_INCLUDE_DIR@/../;
+    export CLHEP_INCLUDE_DIR=@CLHEP_INCLUDE_DIR@;
     dd4hep_add_library_path ${G4LIB_DIR};
     unset G4ENV_INIT;
     unset G4LIB_DIR;