Merge branch 'master' into update-to-g4-10.7.3

ReleaseNotes/v10r6p2t7.md

+2023-02-15 Geant4 v10r6p2t7
+===
+
+This is the build of Geant4 in the LHCb environment with LHCb patches and tests.
+
+This version is based on  10.6.p04
+([original release notes](ReleaseNotes4.10.6.html) and [patch notes](Patch4.10.6-2.txt))
+
+This version uses
+LCG [102](http://lcginfo.cern.ch/release/101/) with ROOT 6.26.08.
+
+This version is released on `master` branch.
+Built relative to Geant4 [v10r6p2p6](/../../tags/v10r6p2t6), with the following changes:
+
+
+### Main changes
+
+- ~Build | Fix Geant4 relocatability, !89
+- ~Core | use G4 10.7 version of LogicalBorderSurface on a G4 10.6 baseline, !90

cmake/Modules/LHCbSettings.cmake

@@ -75,12 +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})
-    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()