diff --git a/CMakeLists.txt b/CMakeLists.txt index 99f5802df699b13c6048aa06bb9e68be30bdd89a..fec072b77f8aa4bdcab10c36fa182769d42834d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5) set(GEANT4_SRCS_REPOSITORY https://gitlab.cern.ch/lhcb/Geant4-srcs.git CACHE STRING "Repository for Geant4 sources") find_package(GaudiProject) -gaudi_project(Geant4 v96r4p6 +gaudi_project(Geant4 v96r4p7 DATA Geant4Files VERSION v96r*) # FIXME: hack for compatibility with CMT build diff --git a/Geant4/G4config/cmt/requirements b/Geant4/G4config/cmt/requirements index a91ba3e6492aaea06a751b445749f65dfda63f2f..5c91e8414a5a5261f2e2f848fe9b2080707f4b35 100755 --- a/Geant4/G4config/cmt/requirements +++ b/Geant4/G4config/cmt/requirements @@ -1,5 +1,5 @@ package G4config -version v96r4p6 +version v96r4p7 branches cmt doc @@ -19,7 +19,7 @@ use Geant4Files v96r* -no_auto_imports #============================================================================== set G4_native_version "9.6.p04" \ override-geant4-version "${G4_NATIVE_VERSION}" -set G4VERS v96r4p6 +set G4VERS v96r4p7 # ============================================================================= # set Geant4 environment variables diff --git a/Geant4Sys/cmt/requirements b/Geant4Sys/cmt/requirements index 265b0b75bfc9c3d9914aaf32f3b34e5152936720..16bbfca0a156a0a1777cc621a85e36cf30de4e89 100755 --- a/Geant4Sys/cmt/requirements +++ b/Geant4Sys/cmt/requirements @@ -1,5 +1,5 @@ package Geant4Sys -version v96r4p6 +version v96r4p7 branches cmt doc diff --git a/ReleaseNotes/v96r4p7.md b/ReleaseNotes/v96r4p7.md new file mode 100644 index 0000000000000000000000000000000000000000..034eb34cb47b86f6344068905f27624b3cf2bb98 --- /dev/null +++ b/ReleaseNotes/v96r4p7.md @@ -0,0 +1,9 @@ +2017-07-27 Geant4 v96r4p7 +=== +This version uses LCG 88 and Geant4Files v96r*. + +This version is identical to v96r4p6, but instead of LCG 84 utilises LCG 88. +It is built with CMake. +It is for production for the upgrade. + +This version is released on `Sim09` branch. diff --git a/toolchain.cmake b/toolchain.cmake index 7b903d6a018c1f47349982b4473bef16fa6d3cb0..bd88d9e581680f45daa90409b3d9bc36f2f3e21a 100644 --- a/toolchain.cmake +++ b/toolchain.cmake @@ -1,5 +1,5 @@ # Set the version of HEPTools to use -set(heptools_version 84) +set(heptools_version 88) # this check is needed because the toolchain is called when checking the # compiler (without the proper cache)