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

Merge branch 'UUIDFixes-1.0.48-patches-20200929' into '1.0.48-patches'

UUID Handling Fix, 1.0.48-patches branch (2020.09.30.)

See merge request atlas/atlasexternals!742
parents 57640ec3 5980271a
No related branches found
No related tags found
No related merge requests found
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
# Package building CLHEP as part of the offline build procedure.
#
......@@ -41,9 +41,6 @@ ExternalProject_Add( CLHEP
INSTALL_DIR ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}
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
CMAKE_CACHE_ARGS
-DCMAKE_INSTALL_PREFIX:PATH=${_buildDir}
-DCLHEP_BUILD_DOCS:BOOL=OFF
......
# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
# Project file for the AthDerivationExternals project.
#
......@@ -36,6 +36,10 @@ set( LCG_VERSION_NUMBER 88
CACHE STRING "LCG version number to use for the project" )
find_package( LCG ${LCG_VERSION_NUMBER} REQUIRED EXACT )
# Do not take UUID from the LCG release.
unset( UUID_VERSION CACHE )
unset( UUID_ROOT CACHE )
# Set up CTest:
atlas_ctest_setup()
......
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
# This file is used to configure which externals should be picked up from
# external (AFS/CVMFS) sources.
......@@ -12,6 +12,10 @@ else()
find_package( LCG @LCG_VERSION_NUMBER@ REQUIRED EXACT )
endif()
# Do not take UUID from the LCG release.
unset( UUID_VERSION CACHE )
unset( UUID_ROOT CACHE )
# Set the platform name for Gaudi, and the externals:
set( ATLAS_PLATFORM @ATLAS_PLATFORM@ )
......
# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
# Project file for the AthenaExternals project.
#
......@@ -36,6 +36,10 @@ set( LCG_VERSION_NUMBER 88
CACHE STRING "LCG version number to use for the project" )
find_package( LCG ${LCG_VERSION_NUMBER} REQUIRED EXACT )
# Do not take UUID from the LCG release.
unset( UUID_VERSION CACHE )
unset( UUID_ROOT CACHE )
# Set up CTest:
atlas_ctest_setup()
......
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
# This file is used to configure which externals should be picked up from
# external (AFS/CVMFS) sources.
......@@ -12,6 +12,10 @@ else()
find_package( LCG @LCG_VERSION_NUMBER@ REQUIRED EXACT )
endif()
# Do not take UUID from the LCG release.
unset( UUID_VERSION CACHE )
unset( UUID_ROOT CACHE )
# Set the platform name for Gaudi, and the externals:
set( ATLAS_PLATFORM @ATLAS_PLATFORM@ )
set( CMTCONFIG @ATLAS_PLATFORM@ )
......
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