Skip to content
Snippets Groups Projects
Commit 862e5457 authored by John Derek Chapman's avatar John Derek Chapman Committed by Graeme Stewart
Browse files

CMakeLists.txt: switch to geant4.10.1.patch03.atlas02. ATLASSIM-3144. Tagging...

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)
parent cd0bb349
No related branches found
No related tags found
No related merge requests found
# $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 # Package building Geant4 with all its ATLAS specific patches, for the offline
# builds. # builds.
...@@ -25,12 +25,7 @@ find_package( EXPAT ) ...@@ -25,12 +25,7 @@ find_package( EXPAT )
# Git repository for Geant4: # Git repository for Geant4:
set( _repository https://gitlab.cern.ch/atlas-simulation-team/geant4.git ) set( _repository https://gitlab.cern.ch/atlas-simulation-team/geant4.git )
# Git tag to build: # Git tag to build:
set( _tag "v10.1.3.1" ) set( _tag "v10.1.3.2" )
# 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 some environment variables for the build: # Set some environment variables for the build:
if( APPLE ) if( APPLE )
...@@ -54,7 +49,7 @@ set( _extraOptions ) ...@@ -54,7 +49,7 @@ set( _extraOptions )
if( "${CMAKE_CXX_STANDARD}" EQUAL 11 ) if( "${CMAKE_CXX_STANDARD}" EQUAL 11 )
list( APPEND _extraOptions -DGEANT4_BUILD_CXXSTD=c++11 ) list( APPEND _extraOptions -DGEANT4_BUILD_CXXSTD=c++11 )
elseif( "${CMAKE_CXX_STANDARD}" EQUAL 14 ) elseif( "${CMAKE_CXX_STANDARD}" EQUAL 14 )
list( APPEND _extraOptions -DGEANT4_BUILD_CXXSTD=c++1y ) list( APPEND _extraOptions -DGEANT4_BUILD_CXXSTD=c++14 )
endif() endif()
if( NOT "${CMAKE_BUILD_TYPE}" STREQUAL "" ) if( NOT "${CMAKE_BUILD_TYPE}" STREQUAL "" )
list( APPEND _extraOptions -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ) list( APPEND _extraOptions -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment