Skip to content
Snippets Groups Projects
Commit 1a72080f authored by Attila Krasznahorkay's avatar Attila Krasznahorkay Committed by Graeme Stewart
Browse files

Renaming CentOS builds from cc7 to centos7 (AtlasLCG-00-00-60) 

	* Changed the "short name" of CentOS to "centos" from the
	  previous "cc". As that's the new SFT convention.
	* Tagging as AtlasLCG-00-00-60

2016-06-03 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
	* As it turned out, the previous code broke down when trying to
	  generate environment setup files, while having included the
	  package "with version 0". This should now work as well.
	* Tagging as AtlasLCG-00-00-59

2016-06-03 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
	* Made it possible to make use of the modules of the package
	  without actually setting up an LCG release. So that we could use
	  the same find modules for looking up externals in standalone
	  builds as well.
	* Tagging as AtlasLCG-00-00-58


Former-commit-id: 0315a241
parent 899e6271
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Build/AtlasLCG/LCGConfig-version.cmake
+ 19
− 4
View file @ 1a72080f
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
# $Id: LCGConfig-version.cmake 740816 2016-04-17 08:12:15Z krasznaa $ # $Id: LCGConfig-version.cmake 752088 2016-06-03 11:34:42Z krasznaa $
# #
# This file is used to figure out whether the LCG version that the user # This file is used to figure out whether the LCG version that the user
# requested can be delivered or not. # requested can be delivered or not.
...@@ -27,20 +27,35 @@ endif() ...@@ -27,20 +27,35 @@ endif()
set( LCG_releases_base ${LCG_RELEASE_BASE} set( LCG_releases_base ${LCG_RELEASE_BASE}
CACHE PATH "Directory holding LCG releases" FORCE ) CACHE PATH "Directory holding LCG releases" FORCE )
# Requesting version 0 means that we only want to use the package's
# modules. But not set up an actual release from AFS/CVMFS.
if( PACKAGE_FIND_VERSION EQUAL 0 )
message( STATUS "Using the LCG modules without setting up a release" )
set( PACKAGE_VERSION 0 )
set( PACKAGE_VERSION_NUMBER 0 )
set( PACKAGE_VERSION_COMPATIBLE TRUE )
set( PACKAGE_VERSION_EXACT FALSE )
# If a directory with the requested version string exists, then we're # If a directory with the requested version string exists, then we're
# done already. # done already.
if( EXISTS elseif( EXISTS
${LCG_RELEASE_BASE}/LCG_${PACKAGE_FIND_VERSION}${LCG_VERSION_POSTFIX} ) ${LCG_RELEASE_BASE}/LCG_${PACKAGE_FIND_VERSION}${LCG_VERSION_POSTFIX} )
set( PACKAGE_VERSION ${PACKAGE_FIND_VERSION}${LCG_VERSION_POSTFIX} ) set( PACKAGE_VERSION ${PACKAGE_FIND_VERSION}${LCG_VERSION_POSTFIX} )
set( PACKAGE_VERSION_NUMBER ${PACKAGE_FIND_VERSION} ) set( PACKAGE_VERSION_NUMBER ${PACKAGE_FIND_VERSION} )
set( PACKAGE_VERSION_COMPATIBLE TRUE ) set( PACKAGE_VERSION_COMPATIBLE TRUE )
set( PACKAGE_VERSION_EXACT TRUE ) set( PACKAGE_VERSION_EXACT TRUE )
elseif( NOT PACKAGE_FIND_VERSION )
# If no version was requested:
message( STATUS "No LCG version requested. Not setting up release." )
set( PACKAGE_VERSION 0 )
set( PACKAGE_VERSION_NUMBER 0 )
set( PACKAGE_VERSION_COMPATIBLE TRUE )
set( PACKAGE_VERSION_EXACT FALSE )
else() else()
# If it doesn't exist, then pick up the latest release, and check if it's # If it doesn't exist, then pick up the latest release, and check if it's
# newer than the one requested. # newer than the one requested.
message( WARNING "Can't find the requested LCG version. " message( WARNING "Can't find the requested LCG version. "
"Falling back to LCG_82." ) "Falling back to LCG_84." )
set( PACKAGE_VERSION "82" ) set( PACKAGE_VERSION "84" )
set( PACKAGE_VERSION_NUMBER ${PACKAGE_VERSION} ) set( PACKAGE_VERSION_NUMBER ${PACKAGE_VERSION} )
if( "${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" ) if( "${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
set( PACKAGE_VERSION_COMPATIBLE FALSE ) set( PACKAGE_VERSION_COMPATIBLE FALSE )
......
Build/AtlasLCG/LCGConfig.cmake
+ 56
− 50
View file @ 1a72080f
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
# $Id: LCGConfig.cmake 751138 2016-05-31 13:50:48Z krasznaa $ # $Id: LCGConfig.cmake 755442 2016-06-16 15:08:07Z krasznaa $
# #
# File implementing the code that gets called when a project imports # File implementing the code that gets called when a project imports
# LCG using something like: # LCG using something like:
...@@ -99,7 +99,7 @@ function( lcg_os_id os isValid ) ...@@ -99,7 +99,7 @@ function( lcg_os_id os isValid )
elseif( _lcgLinuxId MATCHES "Ubuntu" ) elseif( _lcgLinuxId MATCHES "Ubuntu" )
set( _linuxShort "ubuntu" ) set( _linuxShort "ubuntu" )
elseif( _lcgLinuxId MATCHES "CentOS" ) elseif( _lcgLinuxId MATCHES "CentOS" )
set( _linuxShort "cc" ) set( _linuxShort "centos" )
else() else()
message( WARNING "Linux flavour (${_lcgLinuxId}) not recognised" ) message( WARNING "Linux flavour (${_lcgLinuxId}) not recognised" )
set( _linuxShort "linux" ) set( _linuxShort "linux" )
...@@ -334,57 +334,63 @@ function( lcg_setup_release lcgReleaseDir ) ...@@ -334,57 +334,63 @@ function( lcg_setup_release lcgReleaseDir )
endfunction( lcg_setup_release ) endfunction( lcg_setup_release )
# Get the platform ID: # Only set up a release, if the requested release number was
if( NOT "$ENV{LCG_PLATFORM}" STREQUAL "" ) # something other than 0.
set( LCG_PLATFORM $ENV{LCG_PLATFORM} if( NOT LCG_VERSION EQUAL 0 )
CACHE STRING "Platform name for the LCG release being used" )
else()
lcg_platform_id( LCG_PLATFORM )
set( LCG_PLATFORM ${LCG_PLATFORM}
CACHE STRING "Platform name for the LCG release being used" )
endif()
# Tell the user what's happening: # Get the platform ID:
if( NOT LCG_FIND_QUIETLY ) if( NOT "$ENV{LCG_PLATFORM}" STREQUAL "" )
message( STATUS set( LCG_PLATFORM $ENV{LCG_PLATFORM}
"Setting up LCG release \"${LCG_VERSION}\" for platform: " CACHE STRING "Platform name for the LCG release being used" )
"${LCG_PLATFORM}" ) else()
endif() lcg_platform_id( LCG_PLATFORM )
set( LCG_PLATFORM ${LCG_PLATFORM}
CACHE STRING "Platform name for the LCG release being used" )
endif()
# Some sanity checks: # Tell the user what's happening:
if( LCG_FIND_COMPONENTS ) if( NOT LCG_FIND_QUIETLY )
message( WARNING "Components \"${LCG_FIND_COMPONENTS}\" requested, but " message( STATUS
"finding LCG components is not supported" ) "Setting up LCG release \"${LCG_VERSION}\" for platform: "
endif() "${LCG_PLATFORM}" )
endif()
# Some sanity checks:
if( LCG_FIND_COMPONENTS )
message( WARNING "Components \"${LCG_FIND_COMPONENTS}\" requested, but "
"finding LCG components is not supported" )
endif()
# Construct the path to pick up the release from:
set( LCG_RELEASE_DIR ${LCG_RELEASE_BASE}/LCG_${LCG_VERSION}
CACHE PATH "Directory holding the LCG release" )
# Start out with the assumption that LCG is now found:
set( LCG_FOUND TRUE CACHE BOOL
"Flag showing whether LCG was found or not" )
mark_as_advanced( LCG_FOUND )
# Set up the release:
lcg_setup_release( ${LCG_RELEASE_DIR} )
# Extra setting(s) for some package(s):
file( GLOB BOOST_INCLUDEDIR "${BOOST_ROOT}/include/*" )
list( APPEND CMAKE_PREFIX_PATH ${PYTHON_ROOT} )
file( GLOB PYTHON_INCLUDE_DIR "${PYTHON_ROOT}/include/*" )
set( PYTHON_INCLUDE_DIR ${PYTHON_INCLUDE_DIR} CACHE PATH
"Python include directory" FORCE )
file( GLOB PYTHON_LIBRARY "${PYTHON_ROOT}/lib/libpython*.so" )
set( PYTHON_LIBRARY ${PYTHON_LIBRARY}
CACHE FILEPATH "Python library" FORCE )
list( APPEND CMAKE_PREFIX_PATH ${DOXYGEN_ROOT} )
set( GSL_ROOT_DIR ${GSL_ROOT} )
list( APPEND CMAKE_PREFIX_PATH ${QT_ROOT} )
list( APPEND CMAKE_PREFIX_PATH ${QT5_ROOT} )
list( APPEND CMAKE_PREFIX_PATH ${GRAPHVIZ_ROOT} )
list( APPEND CMAKE_PREFIX_PATH ${COIN3D_ROOT} )
list( APPEND CMAKE_PREFIX_PATH ${EXPAT_ROOT} )
# Construct the path to pick up the release from: endif()
set( LCG_RELEASE_DIR ${LCG_RELEASE_BASE}/LCG_${LCG_VERSION}
CACHE PATH "Directory holding the LCG release" )
# Start out with the assumption that LCG is now found:
set( LCG_FOUND TRUE CACHE BOOL
"Flag showing whether LCG was found or not" )
mark_as_advanced( LCG_FOUND )
# Set up the release:
lcg_setup_release( ${LCG_RELEASE_DIR} )
# Extra setting(s) for some package(s):
file( GLOB BOOST_INCLUDEDIR "${BOOST_ROOT}/include/*" )
list( APPEND CMAKE_PREFIX_PATH ${PYTHON_ROOT} )
file( GLOB PYTHON_INCLUDE_DIR "${PYTHON_ROOT}/include/*" )
set( PYTHON_INCLUDE_DIR ${PYTHON_INCLUDE_DIR} CACHE PATH
"Python include directory" FORCE )
file( GLOB PYTHON_LIBRARY "${PYTHON_ROOT}/lib/libpython*.so" )
set( PYTHON_LIBRARY ${PYTHON_LIBRARY}
CACHE FILEPATH "Python library" FORCE )
list( APPEND CMAKE_PREFIX_PATH ${DOXYGEN_ROOT} )
set( GSL_ROOT_DIR ${GSL_ROOT} )
list( APPEND CMAKE_PREFIX_PATH ${QT_ROOT} )
list( APPEND CMAKE_PREFIX_PATH ${QT5_ROOT} )
list( APPEND CMAKE_PREFIX_PATH ${GRAPHVIZ_ROOT} )
list( APPEND CMAKE_PREFIX_PATH ${COIN3D_ROOT} )
list( APPEND CMAKE_PREFIX_PATH ${EXPAT_ROOT} )
# Get the current directory: # Get the current directory:
get_filename_component( _thisdir "${CMAKE_CURRENT_LIST_FILE}" PATH ) get_filename_component( _thisdir "${CMAKE_CURRENT_LIST_FILE}" PATH )
......
Build/AtlasLCG/modules/FindPythonInterp.cmake
+ 7
− 4
View file @ 1a72080f
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
# $Id: FindPythonInterp.cmake 719980 2016-01-27 08:38:07Z krasznaa $ # $Id: FindPythonInterp.cmake 752031 2016-06-03 09:12:47Z krasznaa $
# #
# This file is here to intercept find_package(PythonInterp) calls, and extend # This file is here to intercept find_package(PythonInterp) calls, and extend
# the environment setup file of the project with the correct Python paths. # the environment setup file of the project with the correct Python paths.
...@@ -14,9 +14,12 @@ include( LCGFunctions ) ...@@ -14,9 +14,12 @@ include( LCGFunctions )
set( _modulePathBackup ${CMAKE_MODULE_PATH} ) set( _modulePathBackup ${CMAKE_MODULE_PATH} )
set( CMAKE_MODULE_PATH ) set( CMAKE_MODULE_PATH )
# Make the code ignore the system path(s): # Make the code ignore the system path(s). If we are to pick up Python
set( CMAKE_SYSTEM_IGNORE_PATH /usr/include /usr/bin /usr/lib /usr/lib32 # from the release.
/usr/lib64 ) if( PYTHON_ROOT )
set( CMAKE_SYSTEM_IGNORE_PATH /usr/include /usr/bin /usr/lib /usr/lib32
/usr/lib64 )
endif()
# Call CMake's own FindPythonInterp.cmake. Note that the arguments created # Call CMake's own FindPythonInterp.cmake. Note that the arguments created
# for this script by CMake pass through to the official script. So we don't # for this script by CMake pass through to the official script. So we don't
......
Build/AtlasLCG/modules/FindPythonLibs.cmake
+ 7
− 4
View file @ 1a72080f
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
# $Id: FindPythonLibs.cmake 734923 2016-04-08 15:32:19Z krasznaa $ # $Id: FindPythonLibs.cmake 752031 2016-06-03 09:12:47Z krasznaa $
# #
# This file is here to intercept find_package(PythonLibs) calls, and # This file is here to intercept find_package(PythonLibs) calls, and
# massage the paths produced by the system module, to make them relocatable. # massage the paths produced by the system module, to make them relocatable.
...@@ -14,9 +14,12 @@ include( LCGFunctions ) ...@@ -14,9 +14,12 @@ include( LCGFunctions )
set( _modulePathBackup ${CMAKE_MODULE_PATH} ) set( _modulePathBackup ${CMAKE_MODULE_PATH} )
set( CMAKE_MODULE_PATH ) set( CMAKE_MODULE_PATH )
# Make the code ignore the system path(s): # Make the code ignore the system path(s). If we are to pick up Python
set( CMAKE_SYSTEM_IGNORE_PATH /usr/include /usr/bin /usr/lib /usr/lib32 # from the release.
/usr/lib64 ) if( PYTHON_ROOT )
set( CMAKE_SYSTEM_IGNORE_PATH /usr/include /usr/bin /usr/lib /usr/lib32
/usr/lib64 )
endif()
# Call CMake's own FindPythonLibs.cmake. Note that the arguments created # Call CMake's own FindPythonLibs.cmake. Note that the arguments created
# for this script by CMake pass through to the official script. So we don't # for this script by CMake pass through to the official script. So we don't
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment