From c7449b50df66050cf8f24f3e5b90549b8a6e85ab Mon Sep 17 00:00:00 2001
From: John Derek Chapman <chapman@hep.phy.cam.ac.uk>
Date: Fri, 26 Aug 2016 15:29:23 +0200
Subject: [PATCH] CMakeLists.txt: Updated the CMake configuration to take the
G4 sources from the ATLAS-specific Geant4 Git repository. ATLASSIM-2917.
Tagging as Geant4-10-01-03-14 (Geant4-10-01-03-14)
* CMakeLists.txt: now that Git repository has been updated remove
the by-hand patches from the previous commit. ATLASSIM-2917.
* Tagging as Geant4-10-01-03-14
2016-07-07 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
* Updated the CMake configuration to take the G4 sources from the
ATLAS specific Git repository.
* Not tagging, as the by-hand patches that are applied to make the
code build, should rather be collected into Git directly.
Former-commit-id: 5067913051b95a972a864996ecbbdca779e334c8
---
External/Geant4/CMakeLists.txt | 28 ++++++++--------------------
External/Geant4/cmt/requirements | 2 --
2 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/External/Geant4/CMakeLists.txt b/External/Geant4/CMakeLists.txt
index d9469933a10..aaddb35cddd 100644
--- a/External/Geant4/CMakeLists.txt
+++ b/External/Geant4/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt 751532 2016-06-01 15:40:24Z krasznaa $
+# $Id: CMakeLists.txt 770353 2016-08-26 15:28:34Z jchapman $
#
# Package building Geant4 with all its ATLAS specific patches, for the offline
# builds.
@@ -22,12 +22,11 @@ endif()
find_package( XercesC )
find_package( EXPAT )
-# Source for Geant4:
-set( _source
- http://geant4.web.cern.ch/geant4/support/source/geant4.10.01.p03.tar.gz )
-# The patch for Geant4:
-set( _patchDir
- /afs/cern.ch/atlas/offline/external/geant4/g4.10.1/geant4.10.1.patch03.atlas01 )
+# Git repository for Geant4:
+set( _repository https://gitlab.cern.ch/atlas-simulation-team/geant4.git )
+# Git tag to build:
+set( _tag "v10.1.3.1" )
+
# Version string to replace:
set( _g4vers_orig "geant4-10-01-patch-03" )
# Version string to use:
@@ -72,19 +71,8 @@ atlas_cpu_cores( nCPUs )
ExternalProject_Add( Geant4
PREFIX ${CMAKE_BINARY_DIR}
INSTALL_DIR ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}
- URL ${_source}
- PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory
- ${_patchDir}/ <SOURCE_DIR>
- COMMAND sed "s/${_g4vers_orig}/${_g4vers_patch}/g"
- <SOURCE_DIR>/include/G4Version.hh > <SOURCE_DIR>/include/G4Version_new.hh
- COMMAND ${CMAKE_COMMAND} -E rename <SOURCE_DIR>/include/G4Version_new.hh
- <SOURCE_DIR>/include/G4Version.hh
- COMMAND sed "s/${_g4vers_orig}/${_g4vers_patch}/g"
- <SOURCE_DIR>/source/global/management/include/G4Version.hh >
- <SOURCE_DIR>/source/global/management/include/G4Version_new.hh
- COMMAND ${CMAKE_COMMAND} -E rename
- <SOURCE_DIR>/source/global/management/include/G4Version_new.hh
- <SOURCE_DIR>/source/global/management/include/G4Version.hh
+ GIT_REPOSITORY ${_repository}
+ GIT_TAG ${_tag}
CMAKE_CACHE_ARGS
-DGEANT4_USE_GDML:BOOL=ON
-DGEANT4_USE_SYSTEM_ZLIB:BOOL=OFF
diff --git a/External/Geant4/cmt/requirements b/External/Geant4/cmt/requirements
index 7e3e992f101..56f7cd1fe38 100644
--- a/External/Geant4/cmt/requirements
+++ b/External/Geant4/cmt/requirements
@@ -227,7 +227,6 @@ macro_append Geant4_linkopts " -lxerces-c" \
notAsNeeded "" \
asNeeded " $(notAsNeeded_linkopt) -lxerces-c $(asNeeded_linkopt) "
-
# ***************** CLHEP ************************************
macro_append Geant4_linkopts ""
@@ -255,4 +254,3 @@ set G4NEUTRONHPDATA "${Geant4_data}/G4NDL"
set G4LEDATA "${Geant4_data}/G4EMLOW"
set G4NEUTRONXSDATA "${Geant4_data}/G4NEUTRONXS"
set G4SAIDXSDATA "${Geant4_data}/G4SAIDDATA"
-
--
GitLab