From fed7c1dd98bb0d509fb97c60f6e0ecb3bba4cebb Mon Sep 17 00:00:00 2001
From: Marco Clemencic <marco.clemencic@cern.ch>
Date: Wed, 9 Sep 2015 17:35:30 +0200
Subject: [PATCH] v95r2p8g2
---
CMakeLists.txt | 2 +-
Geant4/G4FR/cmt/version.cmt | 1 -
Geant4/G4GDML/cmt/version.cmt | 1 -
Geant4/G4LHCblists/cmt/version.cmt | 1 -
Geant4/G4OpenGL/cmt/version.cmt | 1 -
Geant4/G4RayTracer/cmt/version.cmt | 1 -
Geant4/G4Tree/cmt/version.cmt | 1 -
Geant4/G4UIGAG/cmt/version.cmt | 1 -
Geant4/G4UIbasic/cmt/version.cmt | 1 -
Geant4/G4UIcommon/cmt/version.cmt | 1 -
Geant4/G4VRML/cmt/version.cmt | 1 -
Geant4/G4analysis/cmt/version.cmt | 1 -
Geant4/G4config/cmt/version.cmt | 1 -
Geant4/G4digits_hits/cmt/version.cmt | 1 -
Geant4/G4event/cmt/version.cmt | 1 -
Geant4/G4examples/cmt/version.cmt | 1 -
Geant4/G4externals/cmt/version.cmt | 1 -
Geant4/G4geometry/cmt/version.cmt | 1 -
Geant4/G4global/cmt/version.cmt | 1 -
Geant4/G4graphics_reps/cmt/version.cmt | 1 -
Geant4/G4intercoms/cmt/version.cmt | 1 -
Geant4/G4materials/cmt/version.cmt | 1 -
Geant4/G4modeling/cmt/version.cmt | 1 -
Geant4/G4parmodels/cmt/version.cmt | 1 -
Geant4/G4particles/cmt/version.cmt | 1 -
Geant4/G4physics_lists/cmt/version.cmt | 1 -
Geant4/G4processes/cmt/version.cmt | 1 -
Geant4/G4readout/cmt/version.cmt | 1 -
Geant4/G4run/cmt/version.cmt | 1 -
Geant4/G4track/cmt/version.cmt | 1 -
Geant4/G4tracking/cmt/version.cmt | 1 -
Geant4/G4useVisUI/cmt/version.cmt | 1 -
Geant4/G4vis_management/cmt/version.cmt | 1 -
Geant4Sys/cmt/version.cmt | 1 -
Geant4Sys/doc/release.notes | 2 --
Makefile | 1 -
cmt/project.cmt | 2 +-
toolchain.cmake | 2 +-
38 files changed, 3 insertions(+), 39 deletions(-)
delete mode 100644 Geant4/G4FR/cmt/version.cmt
delete mode 100644 Geant4/G4GDML/cmt/version.cmt
delete mode 100644 Geant4/G4LHCblists/cmt/version.cmt
delete mode 100644 Geant4/G4OpenGL/cmt/version.cmt
delete mode 100644 Geant4/G4RayTracer/cmt/version.cmt
delete mode 100644 Geant4/G4Tree/cmt/version.cmt
delete mode 100644 Geant4/G4UIGAG/cmt/version.cmt
delete mode 100644 Geant4/G4UIbasic/cmt/version.cmt
delete mode 100644 Geant4/G4UIcommon/cmt/version.cmt
delete mode 100644 Geant4/G4VRML/cmt/version.cmt
delete mode 100644 Geant4/G4analysis/cmt/version.cmt
delete mode 100644 Geant4/G4config/cmt/version.cmt
delete mode 100644 Geant4/G4digits_hits/cmt/version.cmt
delete mode 100644 Geant4/G4event/cmt/version.cmt
delete mode 100644 Geant4/G4examples/cmt/version.cmt
delete mode 100644 Geant4/G4externals/cmt/version.cmt
delete mode 100644 Geant4/G4geometry/cmt/version.cmt
delete mode 100644 Geant4/G4global/cmt/version.cmt
delete mode 100644 Geant4/G4graphics_reps/cmt/version.cmt
delete mode 100644 Geant4/G4intercoms/cmt/version.cmt
delete mode 100644 Geant4/G4materials/cmt/version.cmt
delete mode 100644 Geant4/G4modeling/cmt/version.cmt
delete mode 100644 Geant4/G4parmodels/cmt/version.cmt
delete mode 100644 Geant4/G4particles/cmt/version.cmt
delete mode 100644 Geant4/G4physics_lists/cmt/version.cmt
delete mode 100644 Geant4/G4processes/cmt/version.cmt
delete mode 100644 Geant4/G4readout/cmt/version.cmt
delete mode 100644 Geant4/G4run/cmt/version.cmt
delete mode 100644 Geant4/G4track/cmt/version.cmt
delete mode 100644 Geant4/G4tracking/cmt/version.cmt
delete mode 100644 Geant4/G4useVisUI/cmt/version.cmt
delete mode 100644 Geant4/G4vis_management/cmt/version.cmt
delete mode 100644 Geant4Sys/cmt/version.cmt
delete mode 100644 Makefile
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 298919c16f..0d5338ebfc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ if(DEFINED ENV{G4_NATIVE_VERSION})
endif()
find_package(GaudiProject)
-gaudi_project(Geant4 v95r2p8g1
+gaudi_project(Geant4 v95r2p8g2
DATA Geant4Files VERSION v95r*)
file(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX})
diff --git a/Geant4/G4FR/cmt/version.cmt b/Geant4/G4FR/cmt/version.cmt
deleted file mode 100644
index d3c5627158..0000000000
--- a/Geant4/G4FR/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v4r4
diff --git a/Geant4/G4GDML/cmt/version.cmt b/Geant4/G4GDML/cmt/version.cmt
deleted file mode 100644
index cf3d02387a..0000000000
--- a/Geant4/G4GDML/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v1r0
diff --git a/Geant4/G4LHCblists/cmt/version.cmt b/Geant4/G4LHCblists/cmt/version.cmt
deleted file mode 100644
index 25cbc4f2e2..0000000000
--- a/Geant4/G4LHCblists/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v3r0
diff --git a/Geant4/G4OpenGL/cmt/version.cmt b/Geant4/G4OpenGL/cmt/version.cmt
deleted file mode 100644
index d3c5627158..0000000000
--- a/Geant4/G4OpenGL/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v4r4
diff --git a/Geant4/G4RayTracer/cmt/version.cmt b/Geant4/G4RayTracer/cmt/version.cmt
deleted file mode 100644
index 3c20424588..0000000000
--- a/Geant4/G4RayTracer/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v5r1p1
diff --git a/Geant4/G4Tree/cmt/version.cmt b/Geant4/G4Tree/cmt/version.cmt
deleted file mode 100644
index f6795f9cb8..0000000000
--- a/Geant4/G4Tree/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v4r1p1
diff --git a/Geant4/G4UIGAG/cmt/version.cmt b/Geant4/G4UIGAG/cmt/version.cmt
deleted file mode 100644
index 46c5e3d467..0000000000
--- a/Geant4/G4UIGAG/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v4r2
diff --git a/Geant4/G4UIbasic/cmt/version.cmt b/Geant4/G4UIbasic/cmt/version.cmt
deleted file mode 100644
index cd4633b6ae..0000000000
--- a/Geant4/G4UIbasic/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v4r3
diff --git a/Geant4/G4UIcommon/cmt/version.cmt b/Geant4/G4UIcommon/cmt/version.cmt
deleted file mode 100644
index 709d940eb9..0000000000
--- a/Geant4/G4UIcommon/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v5r3
diff --git a/Geant4/G4VRML/cmt/version.cmt b/Geant4/G4VRML/cmt/version.cmt
deleted file mode 100644
index 46c5e3d467..0000000000
--- a/Geant4/G4VRML/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v4r2
diff --git a/Geant4/G4analysis/cmt/version.cmt b/Geant4/G4analysis/cmt/version.cmt
deleted file mode 100644
index cf3d02387a..0000000000
--- a/Geant4/G4analysis/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v1r0
diff --git a/Geant4/G4config/cmt/version.cmt b/Geant4/G4config/cmt/version.cmt
deleted file mode 100644
index b24857a4df..0000000000
--- a/Geant4/G4config/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v95r2p8
diff --git a/Geant4/G4digits_hits/cmt/version.cmt b/Geant4/G4digits_hits/cmt/version.cmt
deleted file mode 100644
index b3a878f325..0000000000
--- a/Geant4/G4digits_hits/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v7r1p1
diff --git a/Geant4/G4event/cmt/version.cmt b/Geant4/G4event/cmt/version.cmt
deleted file mode 100644
index 191dd2f347..0000000000
--- a/Geant4/G4event/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v6r0p1
diff --git a/Geant4/G4examples/cmt/version.cmt b/Geant4/G4examples/cmt/version.cmt
deleted file mode 100644
index 318ea395e6..0000000000
--- a/Geant4/G4examples/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v4r1
diff --git a/Geant4/G4externals/cmt/version.cmt b/Geant4/G4externals/cmt/version.cmt
deleted file mode 100644
index cf3d02387a..0000000000
--- a/Geant4/G4externals/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v1r0
diff --git a/Geant4/G4geometry/cmt/version.cmt b/Geant4/G4geometry/cmt/version.cmt
deleted file mode 100644
index 46c246f83f..0000000000
--- a/Geant4/G4geometry/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v6r2p1
diff --git a/Geant4/G4global/cmt/version.cmt b/Geant4/G4global/cmt/version.cmt
deleted file mode 100644
index 3c20424588..0000000000
--- a/Geant4/G4global/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v5r1p1
diff --git a/Geant4/G4graphics_reps/cmt/version.cmt b/Geant4/G4graphics_reps/cmt/version.cmt
deleted file mode 100644
index f6795f9cb8..0000000000
--- a/Geant4/G4graphics_reps/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v4r1p1
diff --git a/Geant4/G4intercoms/cmt/version.cmt b/Geant4/G4intercoms/cmt/version.cmt
deleted file mode 100644
index f6795f9cb8..0000000000
--- a/Geant4/G4intercoms/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v4r1p1
diff --git a/Geant4/G4materials/cmt/version.cmt b/Geant4/G4materials/cmt/version.cmt
deleted file mode 100644
index 44c345dd07..0000000000
--- a/Geant4/G4materials/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v5r0p1
diff --git a/Geant4/G4modeling/cmt/version.cmt b/Geant4/G4modeling/cmt/version.cmt
deleted file mode 100644
index f6795f9cb8..0000000000
--- a/Geant4/G4modeling/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v4r1p1
diff --git a/Geant4/G4parmodels/cmt/version.cmt b/Geant4/G4parmodels/cmt/version.cmt
deleted file mode 100644
index 46c246f83f..0000000000
--- a/Geant4/G4parmodels/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v6r2p1
diff --git a/Geant4/G4particles/cmt/version.cmt b/Geant4/G4particles/cmt/version.cmt
deleted file mode 100644
index 46c246f83f..0000000000
--- a/Geant4/G4particles/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v6r2p1
diff --git a/Geant4/G4physics_lists/cmt/version.cmt b/Geant4/G4physics_lists/cmt/version.cmt
deleted file mode 100644
index ab6ce4246c..0000000000
--- a/Geant4/G4physics_lists/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v1r3
diff --git a/Geant4/G4processes/cmt/version.cmt b/Geant4/G4processes/cmt/version.cmt
deleted file mode 100644
index 816075e759..0000000000
--- a/Geant4/G4processes/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v8r3p4
diff --git a/Geant4/G4readout/cmt/version.cmt b/Geant4/G4readout/cmt/version.cmt
deleted file mode 100644
index f6795f9cb8..0000000000
--- a/Geant4/G4readout/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v4r1p1
diff --git a/Geant4/G4run/cmt/version.cmt b/Geant4/G4run/cmt/version.cmt
deleted file mode 100644
index 3c20424588..0000000000
--- a/Geant4/G4run/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v5r1p1
diff --git a/Geant4/G4track/cmt/version.cmt b/Geant4/G4track/cmt/version.cmt
deleted file mode 100644
index 3c20424588..0000000000
--- a/Geant4/G4track/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v5r1p1
diff --git a/Geant4/G4tracking/cmt/version.cmt b/Geant4/G4tracking/cmt/version.cmt
deleted file mode 100644
index e9e7e3a6c8..0000000000
--- a/Geant4/G4tracking/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v6r1p1
diff --git a/Geant4/G4useVisUI/cmt/version.cmt b/Geant4/G4useVisUI/cmt/version.cmt
deleted file mode 100644
index 93062f73bc..0000000000
--- a/Geant4/G4useVisUI/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v3r1
diff --git a/Geant4/G4vis_management/cmt/version.cmt b/Geant4/G4vis_management/cmt/version.cmt
deleted file mode 100644
index 12e68ed64f..0000000000
--- a/Geant4/G4vis_management/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v4r2p1
diff --git a/Geant4Sys/cmt/version.cmt b/Geant4Sys/cmt/version.cmt
deleted file mode 100644
index b24857a4df..0000000000
--- a/Geant4Sys/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v95r2p8
diff --git a/Geant4Sys/doc/release.notes b/Geant4Sys/doc/release.notes
index 7a4cae1fb8..475c80c8c3 100755
--- a/Geant4Sys/doc/release.notes
+++ b/Geant4Sys/doc/release.notes
@@ -7,8 +7,6 @@ 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
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 46d73c68f3..0000000000
--- a/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include ${LBCONFIGURATIONROOT}/data/Makefile
diff --git a/cmt/project.cmt b/cmt/project.cmt
index 2874c13cf1..ee03409976 100755
--- a/cmt/project.cmt
+++ b/cmt/project.cmt
@@ -1,6 +1,6 @@
project GEANT4
-use GAUDI GAUDI_v25r6p1
+use GAUDI GAUDI_v26r1
use PARAM
build_strategy with_installarea
diff --git a/toolchain.cmake b/toolchain.cmake
index 9ac10a7754..eb33c3b9aa 100644
--- a/toolchain.cmake
+++ b/toolchain.cmake
@@ -1,5 +1,5 @@
# Special wrapper to load the declared version of the heptools toolchain.
-set(heptools_version 71root6)
+set(heptools_version 74root6)
find_file(use_heptools_module UseHEPTools.cmake
HINTS ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
--
GitLab