diff --git a/CMakeLists.txt b/CMakeLists.txt index 02270b0485c0ccbf5a2d04a921d982b2128cf09d..62e861f1168a0af0dd8a92fdcc0e0334c1379acf 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 v96r4p4 +gaudi_project(Geant4 v96r4p5 DATA Geant4Files VERSION v96r*) # FIXME: hack for compatibility with CMT build diff --git a/Geant4/G4config/cmt/requirements b/Geant4/G4config/cmt/requirements index 84c366be5fe7f949fb52efedb0ee789631b91a0b..4a752434c9bbe674fbd0b209381a09a325cabc2f 100755 --- a/Geant4/G4config/cmt/requirements +++ b/Geant4/G4config/cmt/requirements @@ -1,5 +1,5 @@ package G4config -version v96r4p4 +version v96r4p5 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 v96r4p4 +set G4VERS v96r4p5 # ============================================================================= # set Geant4 environment variables diff --git a/Geant4Sys/cmt/requirements b/Geant4Sys/cmt/requirements index 5cad9b85a739eaf8c35e2d0ae636aa3f8ea275b9..59300a4aa268821247deddbda4299e1937721848 100755 --- a/Geant4Sys/cmt/requirements +++ b/Geant4Sys/cmt/requirements @@ -1,5 +1,5 @@ package Geant4Sys -version v96r4p4 +version v96r4p5 branches cmt doc diff --git a/Geant4Sys/doc/release.notes b/Geant4Sys/doc/release.notes index 54a883e41b6d0babb96368ba16f7fe095b0cda47..350bb611e62a1e9efa676ce38691dc23c38c7bbd 100755 --- a/Geant4Sys/doc/release.notes +++ b/Geant4Sys/doc/release.notes @@ -3,6 +3,18 @@ Package : Geant4Sys Package manager(s) : Gloria Corti, Hubert DeGaudenzi, Nigel Watson Purpose : LHCb build using cmt of Geant4 +<P> +<b>BEWARE: +<ul> +<li>As from version v96r4p5 this file is no longer maintained. + The release notes for each individual release can be found in + the ReleaseNotes subdirectory of the project +<li>As from version v96r4p4, this project is maintained only in Git +<li>The package release notes are no longer maintained, look at the Git Merge Request (MR) comments +<li>The package versions are no longer maintained, use the Git commit IDs +</ul> +</b> + !============================================================================= !</PRE><H1><A NAME=v96r4p4>2016-06-10 Geant4Sys v96r4p4</A></H1><PRE> diff --git a/ReleaseNotes/v96r4p5.md b/ReleaseNotes/v96r4p5.md new file mode 100644 index 0000000000000000000000000000000000000000..95734a97fee4d058bda73a5d4aa270c7ec270268 --- /dev/null +++ b/ReleaseNotes/v96r4p5.md @@ -0,0 +1,27 @@ +2017-07-19 Geant4 v96r4p5 +=== +This version uses project Gaudi v27r1 (LCG 84) and Geant4Files v96r*. + +This version is identical to v96r4p4 but for some changes to support cmake. +It is for production for the upgrade. + +This version is released on `Sim09` branch. + +This version is the last one released with cmt. + +## Cmake support +**[MR !15] Fix Geant4 CMake build to install libraries in lib instead of lib64** + +**[MR !13] Updated toolchain.cmake to work with latest LbScripts** + +**[Geant4-srcs@bf2605ee] Fixed case of Hadr00.cc** + +**[Geant4-srcs@8455b1ea] Merge branch 'add-gcc49-support' into 'master', see [MR Geant4-srcs!2]** + +**[Geant4-srcs@d88e7bb5] removed circular dependenci of G4processes** + +**[Geant4-srcs@3acf5bc0]added support for c++1y and c++14** + +**[Geant4-srcs@a32dbfc2]added patches introduced after the original migration to CMake of LHCb Geant4** + +