v95r2p8

CMakeLists.txt

@@ -13,7 +13,7 @@ if(DEFINED ENV{G4_NATIVE_VERSION})
 endif()
 
 find_package(GaudiProject)
-gaudi_project(Geant4 v95r2p7g4
+gaudi_project(Geant4 v95r2p8
               DATA Geant4Files VERSION v95r*)
 
 file(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX})

Geant4/G4config/cmt/copy_include.csh

@@ -8,10 +8,10 @@ cd ../../..
 
 set incl_dir = $G4SHARE/include/
 
-if !( -d InstallArea/include ) then 
-  mkdir -p InstallArea
+if !( -d InstallArea/$CMTCONFIG/include ) then
+  mkdir -p InstallArea/$CMTCONFIG
 
-  cd InstallArea
+  cd InstallArea/$CMTCONFIG
 
   $G4_UNIX_COPY ${incl_dir} .
 

Geant4/G4config/cmt/requirements

 package        G4config
-version        v95r2p7
+version        v95r2p8
 branches       cmt doc
 
 
@@ -13,7 +13,7 @@ use CLHEP       v* LCG_Interfaces
 #==============================================================================
 set G4_native_version     "9.5.p02" \
     override-geant4-version     "${G4_NATIVE_VERSION}"
-set G4VERS v95r2p7
+set G4VERS v95r2p8
 
 # =============================================================================
 # set Geant4 environment variables

Geant4/G4config/cmt/version.cmt

-v95r2p7
+v95r2p8

Geant4/G4config/doc/release.notes

@@ -4,13 +4,17 @@
 ! Purpose     : Configuration package for Geant4 build
 !-----------------------------------------------------------------------------
 
+! ======================= G4config v95r2p8 2015-02-04 ========================
+! 2015-01-26 - Marco Clemencic
+ - Fixed LHCBGAUSS-389: Install Geant4 headers in InstallArea/$CMTCONFIG/include
+
 ! ======================= G4config v95r2p7 2014-07-25 ========================
 ! 2014-06-27 - Gloria Corti
  - Put explicit afs directory for Geant4 sources to fix issue with LCG68 while
    still making it work for earlier LCG version. For details refer to
-   https://its.cern.ch/jira/browse/LHCBGAUSS-221   
+   https://its.cern.ch/jira/browse/LHCBGAUSS-221
  - Put back version 9.5.p02 as source, since for 9.6 tests and nightlies builds
-   that is done via the 'override-geant4-version' mechanism setup up by 
+   that is done via the 'override-geant4-version' mechanism setup up by
    Marco Cl.
 
 ! 2014-03-12 - Marco Clemencic
@@ -131,13 +135,13 @@ permissions.
 
 ! ======================== G4config v94r1 2011-06-29 =========================
 ! 2011-06-09 - Gloria Corti
- - Modify script to copy visualization packages to add 'externals' and adapt 
+ - Modify script to copy visualization packages to add 'externals' and adapt
    it to how the orginal is structured in Geant4
 
 ! 2011-05-17 - Gloria Corti
  - Modify script to copy sources to ignore the includes in the abla directory:
    the sources from this directory are ignored in Geant4 but the include files
-   have the same name of those in another directory and copying them overide 
+   have the same name of those in another directory and copying them overide
    the good ones
 
 ! 2011-05-10 - Gloria Corti
@@ -165,7 +169,7 @@ permissions.
 
 ! ======================== G4config v92r3 2010-03-03 =========================
 ! 2010-03-03 - Gloria CORTI
- - Build based on latest patch for G4 9.2, i.e. geant4.9.2.p03 and 
+ - Build based on latest patch for G4 9.2, i.e. geant4.9.2.p03 and
    Gaudi v21r7p1
 
 ! ======================= G4config v92r2p2 2010-02-06 ========================
@@ -173,7 +177,7 @@ permissions.
  - Build based on Gaudi v21r7
 
 ! ======================= G4config v92r2p1 2009-12-18 ========================
-! 2009-12-08 - Hubert DEGAUDENZI 
+! 2009-12-08 - Hubert DEGAUDENZI
  - moved to the new GaudiPolicy for linker libraries, to allow deployement on
    window
 
@@ -182,8 +186,8 @@ permissions.
  - Build based on geant4.9.2.p02
 
 ! 2009-06-10 - Hubert DEGAUDENZI
-  - Changed the way that the external sources are imported. It is now a 
-    CMT action and it is called with the simple make procedure. 
+  - Changed the way that the external sources are imported. It is now a
+    CMT action and it is called with the simple make procedure.
     No more setup script
 
 ! 2009-01-17 - Chris Jones
@@ -278,7 +282,7 @@ permissions.
 
 !========================== G4config v71r0p1 ==============================
 ! 2005-08-22 - Florence RANJARD
- - requirements - use the release version geant4.7.1 
+ - requirements - use the release version geant4.7.1
                   with G4materials v4r1
 
 !========================== G4config v71r0 =================================
@@ -298,7 +302,7 @@ permissions.
 
 !=========================== G4config v70r0 ================================
 ! 2005-01-26 - Florence Ranjard
- - requirements - do not use Geant4Files which is not necessary for the 
+ - requirements - do not use Geant4Files which is not necessary for the
                   compilation
 
 ! 2005-01-03 - Florence RANJARD
@@ -334,7 +338,7 @@ permissions.
 ! 2004-06-08 - Florence RANJARD
  - requirements - use geant4 6.1.ref02
                   compiles with G4VERBOSE switched ON
- 
+
 !============================ G4config v61r1 ================================
 ! 2004-05-07 - Florence RANJARD
  - requirements - use geant4 6.1.ref01
@@ -367,7 +371,7 @@ permissions.
 
 !============================= G4config v52r5 =============================
 ! 2003-11-27 - Florence Ranjard
- - requirements - use also G4INCLUDE, this is necessary to compile G4progen, 
+ - requirements - use also G4INCLUDE, this is necessary to compile G4progen,
                   which needs include files from electromagnetic and hadronic,
                   and avoid cyclic dependencies
 ! 2003-11-03 - Florence RANJARD
@@ -378,7 +382,7 @@ permissions.
 
 !============================= G4config v52r4 ==============================
 ! 2003-10-16 - Florence RANJARD
- - requirements - copy all G4version requirements, remove G4version package 
+ - requirements - copy all G4version requirements, remove G4version package
 
 !============================= G4config v4r0 ================================
 ! 2003-10-13 - Florence RANJARD
@@ -388,7 +392,7 @@ permissions.
 !============================= G4config v3r1 =================================
 ! 2003-10-10 - Florence RANJARD
  - requirements - remove unecessary cppflags.
- - add copy_proc_source.*sh to split G4processes into G4progen G4hadronic 
+ - add copy_proc_source.*sh to split G4processes into G4progen G4hadronic
    and G4electromagnetic.
  - compile with G4VERBOSE Geant4 v52r3
 

Geant4Sys/cmt/requirements

 package     Geant4Sys
-version     v95r2p7
+version     v95r2p8
 
 branches    cmt doc 
  
-use     G4config              v95r2p7 Geant4 
+use     G4config              v95r2p8 Geant4 
  
 # =============================================================================
 # =========== global libraries ================================================

Geant4Sys/cmt/version.cmt

-v95r2p7
+v95r2p8

Geant4Sys/doc/release.notes

@@ -3,6 +3,16 @@ Package            : Geant4Sys
 Package manager(s) : Gloria Corti, Hubert DeGaudenzi, Nigel Watson
 Purpose            : LHCb build using cmt of Geant4
 
+!=============================================================================
+!</PRE><H1><A NAME=v95r2p8>2015-02-04 Geant4Sys v95r2p8</A></H1><PRE>
+
+! ======================= G4config v95r2p8 2015-02-04 ========================
+ - on v95r2b branch
+
+! 2015-01-26 - Marco Clemencic
+ - Fixed LHCBGAUSS-389: Install Geant4 headers in InstallArea/$CMTCONFIG/include
+
+
 !=============================================================================
 !</PRE><H1><A NAME=v95r2p7>2014-07-25 Geant4Sys v95r2p7</A></H1><PRE>
 

cmt/project.cmt

 project GEANT4
 
-use GAUDI	GAUDI_v25r6p1
+use GAUDI	GAUDI_v25r6
 use PARAM
 
 build_strategy	with_installarea

toolchain.cmake

-include($ENV{LBUTILSROOT}/data/toolchain.cmake)
+# Special wrapper to load the declared version of the heptools toolchain.
+set(heptools_version 71)
+
+find_file(use_heptools_module UseHEPTools.cmake
+          HINTS ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+# this check is needed because the toolchain seem to be called a second time
+# without the proper cache
+if(use_heptools_module)
+  include(${use_heptools_module})
+  use_heptools(${heptools_version})
+endif()