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

Merge branch 'IncorporateCLHEPpatch_ATLINFR-2735_master' into 'master'

Switch to using the `CLHEP_2_2_0_4_atl10` from the ATLAS fork of CLHEP.

Closes ATLINFR-2735

See merge request atlas/atlasexternals!376
parents d12d09d7 3fe101a2
No related branches found
Tags 2.0.12
No related merge requests found
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
#
# Package building CLHEP as part of the offline build procedure.
#
......@@ -11,10 +11,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_atl10")
# Extra options for the configuration:
set( _extraOptions )
......@@ -39,12 +39,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}
PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory
<SOURCE_DIR>/CLHEP/ <SOURCE_DIR>
COMMAND ${CMAKE_COMMAND} -E remove_directory <SOURCE_DIR>/CLHEP
COMMAND patch -p2 < ${CMAKE_CURRENT_SOURCE_DIR}/patches/overridden-virtual-warning.patch
GIT_REPOSITORY ${_repository}
GIT_TAG ${_tag}
CMAKE_CACHE_ARGS
-DCMAKE_INSTALL_PREFIX:PATH=${_buildDir}
-DCLHEP_BUILD_DOCS:BOOL=OFF
......@@ -54,7 +50,7 @@ ExternalProject_Add( CLHEP
LOG_CONFIGURE 1
BUILD_COMMAND make -j${nCPUs} )
ExternalProject_Add_Step( CLHEP forcedownload
COMMAND ${CMAKE_COMMAND} -E echo "Forcing the re-download of CLHEP"
COMMAND ${CMAKE_COMMAND} -E echo "Forcing the re-download of CLHEP."
DEPENDERS download )
ExternalProject_Add_Step( CLHEP purgeBuild
COMMAND ${CMAKE_COMMAND} -E remove_directory "<BINARY_DIR>"
......
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