From 862e545776c279c57a15c7edd854f95db1bd3264 Mon Sep 17 00:00:00 2001
From: John Derek Chapman <chapman@hep.phy.cam.ac.uk>
Date: Fri, 18 Nov 2016 16:19:30 +0100
Subject: [PATCH] CMakeLists.txt: switch to geant4.10.1.patch03.atlas02.
ATLASSIM-3144. Tagging as Geant4-10-01-03-20 (Geant4-10-01-03-20)
* CMakeLists.txt: switch to
geant4.10.1.patch03.atlas02. ATLASSIM-3144
* Tagging as Geant4-10-01-03-20
2016-11-02 John Chapman <John.Chapman@cern.ch>
* cmt/requirements, CMakeLists.txt: switch to
geant4.10.1.patch03.atlasmt01. ATLASSIM-3144
* Tagging as Geant4-10-01-03-17
2016-11-01 John Chapman <John.Chapman@cern.ch>
* cmt/requirements, CMakeLists.txt: switch back to
geant4.10.1.patch03.atlas01. Patch CMakeLists.txt file to work
with gcc 6.2. ATLASSIM-3144
* Tagging as Geant4-10-01-03-16
2016-09-14 John Chapman <John.Chapman@cern.ch>
...
(Long ChangeLog diff - truncated)
---
External/Geant4/CMakeLists.txt | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/External/Geant4/CMakeLists.txt b/External/Geant4/CMakeLists.txt
index aaddb35cddd..6696491c230 100644
--- a/External/Geant4/CMakeLists.txt
+++ b/External/Geant4/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt 770353 2016-08-26 15:28:34Z jchapman $
+# $Id: CMakeLists.txt 785143 2016-11-18 16:19:00Z jchapman $
#
# Package building Geant4 with all its ATLAS specific patches, for the offline
# builds.
@@ -25,12 +25,7 @@ find_package( EXPAT )
# 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:
-set( _g4vers_patch "geant4.10.1.patch03.atlas01" )
+set( _tag "v10.1.3.2" )
# Set some environment variables for the build:
if( APPLE )
@@ -54,7 +49,7 @@ set( _extraOptions )
if( "${CMAKE_CXX_STANDARD}" EQUAL 11 )
list( APPEND _extraOptions -DGEANT4_BUILD_CXXSTD=c++11 )
elseif( "${CMAKE_CXX_STANDARD}" EQUAL 14 )
- list( APPEND _extraOptions -DGEANT4_BUILD_CXXSTD=c++1y )
+ list( APPEND _extraOptions -DGEANT4_BUILD_CXXSTD=c++14 )
endif()
if( NOT "${CMAKE_BUILD_TYPE}" STREQUAL "" )
list( APPEND _extraOptions -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} )
--
GitLab