Skip to content
Snippets Groups Projects
Commit 8528809b authored by Attila Krasznahorkay's avatar Attila Krasznahorkay
Browse files

Merge branch 'ExternalSyncToTC-20170328' into '1.0'

Externals Sync to TC (2017.03.28.)

See merge request !17
parents 2c2d4307 43d61120
No related branches found
Tags 1.0.7
No related merge requests found
......@@ -10,10 +10,10 @@ if( ATLAS_RELEASE_MODE )
return()
endif()
# The source to build:
set( _source
http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-2.2.0.4.tgz )
set( _md5 71d2c7c2e39d86a0262e555148de01c1 )
# Git repository for CLHEP:
set( _repository https://gitlab.cern.ch/atlas-sw-git/CLHEP.git )
# Git tag to build:
set( _tag "CLHEP_2_2_0_4_atl01")
# Extra options for the configuration:
set( _extraOptions )
......@@ -38,8 +38,8 @@ set( _buildDir ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CLHEPBuild )
ExternalProject_Add( CLHEP
PREFIX ${CMAKE_BINARY_DIR}
INSTALL_DIR ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}
URL ${_source}
URL_MD5 ${_md5}
GIT_REPOSITORY ${_repository}
GIT_TAG ${_tag}
PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory
<SOURCE_DIR>/CLHEP/ <SOURCE_DIR>
COMMAND ${CMAKE_COMMAND} -E remove_directory <SOURCE_DIR>/CLHEP
......
......@@ -26,8 +26,8 @@ set( _buildDir
# Set up the build of FastJet for the build area:
ExternalProject_Add( FastJet
PREFIX ${CMAKE_BINARY_DIR}
URL http://fastjet.fr/repo/fastjet-3.2.1.tar.gz
URL_MD5 837c66e39653c998de793526bdd16601
URL http://fastjet.fr/repo/fastjet-3.2.0.tar.gz
URL_MD5 3aa9d718ce409675c5c029bdfd6d61da
INSTALL_DIR ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}
CONFIGURE_COMMAND ./configure
--prefix=${_buildDir} --enable-shared --disable-static --enable-allcxxplugins
......
......@@ -21,8 +21,8 @@ set( _buildDir
# Set up the build of FastJetContrib for the build area:
ExternalProject_Add( FastJetContrib
PREFIX ${CMAKE_BINARY_DIR}
URL http://fastjet.hepforge.org/contrib/downloads/fjcontrib-1.025.tar.gz
URL_MD5 a25cc392d75663d9059247c615830783
URL http://fastjet.hepforge.org/contrib/downloads/fjcontrib-1.022.tar.gz
URL_MD5 28a7247b6df196513dda95d9b94b751d
INSTALL_DIR ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}
CONFIGURE_COMMAND ./configure
--fastjet-config=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/fastjet-config
......
......@@ -26,11 +26,6 @@ set( _repository https://gitlab.cern.ch/atlas-simulation-team/geant4.git )
# Git tag to build:
set( _tag "v10.1.3.2" )
# Version string to replace:
set( _g4vers_orig "geant4.10.1.patch03.atlas02" )
# Version string to use:
set( _g4vers_patch "geant4.10.1.patch03.atlasmt02" )
# Set some environment variables for the build:
if( APPLE )
set( ENV{G4SYSTEM} "Darwin-g++" )
......@@ -75,10 +70,6 @@ ExternalProject_Add( Geant4
INSTALL_DIR ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}
GIT_REPOSITORY ${_repository}
GIT_TAG ${_tag}
PATCH_COMMAND sed -i "s/${_g4vers_orig}/${_g4vers_patch}/g"
<SOURCE_DIR>/source/global/management/include/G4Version.hh
COMMAND sed -i "s/${_g4vers_orig}/${_g4vers_patch}/g"
<SOURCE_DIR>/source/run/src/G4RunManagerKernel.cc
CMAKE_CACHE_ARGS
-DGEANT4_USE_GDML:BOOL=ON
-DGEANT4_USE_SYSTEM_ZLIB:BOOL=OFF
......@@ -86,7 +77,7 @@ ExternalProject_Add( Geant4
-DXERCESC_ROOT_DIR:PATH=${XERCESC_ROOT}
-DGEANT4_USE_SYSTEM_CLHEP:BOOL=ON
-DGEANT4_USE_SYSTEM_CLHEP_GRANULAR:BOOL=OFF
-DGEANT4_BUILD_MULTITHREADED:BOOL=ON
-DGEANT4_BUILD_MULTITHREADED:BOOL=OFF
-DGEANT4_BUILD_TLS_MODEL:STRING=global-dynamic
-DCMAKE_INSTALL_PREFIX:PATH=${_buildDir}
-DCMAKE_INSTALL_LIBDIR:STRING=lib
......
22.0.0
21.0.0
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