Merge branch 'mimazure-fix-geant4-relocatability' into 'master'

Fix Geant4 relocatability

Closes #8 and #9

See merge request !89

cmake/Modules/LHCbSettings.cmake

@@ -75,25 +75,6 @@ if(GAUDI_LEGACY_CMAKE_SUPPORT)
         message(FATAL_ERROR "GAUDI_LEGACY_CMAKE_SUPPORT set to TRUE, but cannot find LegacyGaudiCMakeSupport.cmake")
     endif()
 
-    # define environment variables to locate Geant4 data files
-    if(Geant4Files_FOUND)
-        set_property(GLOBAL APPEND PROPERTY Geant4_ENVIRONMENT
-            DEFAULT G4DATA ${GEANT4_INSTALL_DATADIR}
-            SET G4LEVELGAMMADATA \${G4DATA}/PhotonEvaporation5.5
-            SET G4RADIOACTIVEDATA \${G4DATA}/RadioactiveDecay5.4
-            SET G4LEDATA \${G4DATA}/G4EMLOW7.9.1
-            SET G4NEUTRONHPDATA \${G4DATA}/G4NDL4.6
-            SET G4ABLADATA \${G4DATA}/G4ABLA3.1
-            SET G4REALSURFACEDATA \${G4DATA}/RealSurface2.1.1
-            SET G4PIIDATA \${G4DATA}/G4PII1.3
-            SET G4ELASTICDATA \${G4DATA}/G4ELASTIC1.1
-            SET G4SAIDXSDATA \${G4DATA}/G4SAIDDATA2.0
-            SET G4ENSDFSTATEDATA \${G4DATA}/G4ENSDFSTATE2.2
-            SET G4PARTICLEXSDATA \${G4DATA}/G4PARTICLEXS2.1
-            SET G4INCLDATA \${G4DATA}/G4INCL1.0
-        )
-    endif()
-
     set_property(GLOBAL APPEND PROPERTY ${PROJECT_NAME}_ENVIRONMENT
         PREPEND PATH ${CMAKE_INSTALL_PREFIX}/bin
         PREPEND LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib

cmake/Templates/LHCbConfigSettings.cmake.in

@@ -2,9 +2,14 @@
 
 # Set environment variables for Geant4 data files (only if we have the lhcb_env command)
 if(COMMAND lhcb_env)
+    find_data_package(Geant4Files ${Geant4_VERSION_MAJOR}${Geant4_VERSION_MINOR}.0)
     lhcb_env(DEFAULT G4DATA "@GEANT4_INSTALL_DATADIR@")
     foreach(_g4dataset_name IN LISTS Geant4_DATASETS)
-        string(REPLACE "@GEANT4_INSTALL_DATADIR@" "" _g4dataset_path "${Geant4_DATASET_${_g4dataset_name}_PATH}")
-        lhcb_env(SET "${Geant4_DATASET_${_g4dataset_name}_ENVVAR}" "\${G4DATA}/${_g4dataset_path}")
+        string(REPLACE "@GEANT4_INSTALL_DATADIR@/" "" _g4dataset_path "${Geant4_DATASET_${_g4dataset_name}_PATH}")
+        lhcb_env(PRIVATE SET "${Geant4_DATASET_${_g4dataset_name}_ENVVAR}" "\${G4DATA}/${_g4dataset_path}")
     endforeach()
+
+    lhcb_env(PREPEND PATH "${CMAKE_CURRENT_LIST_DIR}/../../bin")
+    lhcb_env(PREPEND LD_LIBRARY_PATH "${CMAKE_CURRENT_LIST_DIR}/../")
+    lhcb_env(PREPEND ROOT_INCLUDE_PATH "${CMAKE_CURRENT_LIST_DIR}/../../include/Geant4")
 endif()