diff --git a/CMakeLists.txt b/CMakeLists.txt index 10016e18c1410e6f2c5ee268fd30e96e2627b82d..63763db5552dbf7eff695abf3036879d3b4121e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,12 +1,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5) -# NO_NINJA : Geant4 build fails with Ninja - set(GEANT4_SRCS_REPOSITORY https://gitlab.cern.ch/lhcb/Geant4-srcs.git CACHE STRING "Repository for Geant4 sources") set(GEANT4FILES_VERSION v106r1 CACHE STRING "Version for Geant4Files to match Geant4-src version") find_package(GaudiProject) -gaudi_project(Geant4 v106r2p2 +gaudi_project(Geant4 v106r2p3 DATA Geant4Files VERSION ${GEANT4FILES_VERSION}) # FIXME: hack for compatibility with CMT build diff --git a/Geant4/G4config/CMakeLists.txt b/Geant4/G4config/CMakeLists.txt index dd3b6d73bc817cc5fd86e49034d1b5ec3ef2832a..86c744c981633220e2e4b62675ea36c72e7b7bc2 100644 --- a/Geant4/G4config/CMakeLists.txt +++ b/Geant4/G4config/CMakeLists.txt @@ -57,7 +57,7 @@ ExternalProject_Add(Geant4 -DGEANT4_USE_NETWORKVRML=ON -DGEANT4_USE_NETWORKDAWN=ON -DGEANT4_USE_INVENTOR=OFF - -DCMAKE_INSTALL_PREFIX=${CMAKE_SOURCE_DIR}/InstallArea/$ENV{CMTCONFIG} + -DCMAKE_INSTALL_PREFIX=${CMAKE_SOURCE_DIR}/InstallArea/${BINARY_TAG} -DCMAKE_INSTALL_LIBDIR=lib -DGEANT4_INSTALL_DATADIR=${G4DATA} -DGEANT4_BUILD_VERBOSE_CODE=${G4VERBOSE} diff --git a/ReleaseNotes/v106r2p3.md b/ReleaseNotes/v106r2p3.md new file mode 100644 index 0000000000000000000000000000000000000000..cbd32acf594591193529b4b98a2d341cf5c92e9c --- /dev/null +++ b/ReleaseNotes/v106r2p3.md @@ -0,0 +1,11 @@ +2021-01-19 Geant4 v106r2p3 +=== +This release is based on `GEANT4 r10.6.2`, uses `LCG 97a` and `Geant4Files v106r1`. + +This version is released on `Sim10` branch. + +## Latest Changes + +#### General +**Rogue symbols fix in Geant4-srcs +**Minor fixes to CMake diff --git a/toolchain.cmake b/toolchain.cmake index 797c20d48ddc6aa174bdca9fc2d4a6329dd965ab..45a254fa3bfc57fff9882eec7fdc105629998468 100644 --- a/toolchain.cmake +++ b/toolchain.cmake @@ -23,7 +23,8 @@ if(NOT CMAKE_SOURCE_DIR MATCHES "CMakeTmp") # - ninja (it requires LD_LIBRARY_PATH set to run) # - Gaudi (we do not want to use it from LCG) # - xenv (conflicts with the version in the build environment) - list(FILTER CMAKE_PREFIX_PATH EXCLUDE REGEX "(LCG_|lcg/nightlies).*(ninja|Gaudi|xenv)") + # - git (requires a special environment provided only by LCG views) + list(FILTER CMAKE_PREFIX_PATH EXCLUDE REGEX "(LCG_|lcg/nightlies).*(ninja|Gaudi|xenv|git)/") endif() endif()