Commits (10)
......@@ -154,7 +154,7 @@ endfunction( _atlas_add_script_test )
# [LOG_IGNORE_PATTERN patterns]
# [PRE_EXEC_SCRIPT script]
# [POST_EXEC_SCRIPT script]
# [ENVIRONMENT env]
# [ENVIRONMENT env...]
# [LABELS label1...]
# [PROPERTIES <name> <value>...]
# [PRIVATE_WORKING_DIRECTORY]
......@@ -167,7 +167,7 @@ endfunction( _atlas_add_script_test )
# [LOG_IGNORE_PATTERN patterns]
# [PRE_EXEC_SCRIPT script]
# [POST_EXEC_SCRIPT script]
# [ENVIRONMENT env]
# [ENVIRONMENT env...]
# [LABELS label1...]
# [PROPERTIES <name> <value>...]
# [PRIVATE_WORKING_DIRECTORY] )
......@@ -177,8 +177,8 @@ function( atlas_add_test testName )
# Parse the options given to the function:
set( _booleanArgs NOEXEC PRIVATE_WORKING_DIRECTORY )
set( _singleParamArgs SCRIPT LOG_SELECT_PATTERN LOG_IGNORE_PATTERN
ENVIRONMENT PRE_EXEC_SCRIPT POST_EXEC_SCRIPT )
set( _multiParamArgs SOURCES LABELS PROPERTIES )
PRE_EXEC_SCRIPT POST_EXEC_SCRIPT )
set( _multiParamArgs SOURCES LABELS PROPERTIES ENVIRONMENT )
cmake_parse_arguments( ARG "${_booleanArgs}" "${_singleParamArgs}"
"${_multiParamArgs}" ${ARGN} )
......
# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
#
# Wrapper around CMake's built-in FindBLAS.cmake module. Making sure that
# the found include path and library directory are set up in a relocatable
......@@ -8,8 +8,14 @@
# The LCG include(s):
include( LCGFunctions )
# Hide possible messages about OpenMP not being found. See AGENE-2118.
set( OpenMP_FIND_QUIETLY TRUE )
# Use the helper macro for the wrapping:
lcg_wrap_find_module( BLAS NO_LIBRARY_DIRS )
# Set back the default behaviour of the OpenMP output visibility.
unset( OpenMP_FIND_QUIETLY )
# Set up the RPM dependency:
lcg_need_rpm( blas )
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
#
# Wrapper around CMake's built-in FindSQLite3.cmake module. Making sure that
# the found include path and library directory are set up in a relocatable
......@@ -11,5 +11,13 @@ include( LCGFunctions )
# Use the helper macro for the wrapping.
lcg_wrap_find_module( SQLite3 NO_LIBRARY_DIRS )
# Add the binary path,
# to make the `sqlite3` executable accessible at runtime.
# This is important, for example, for GeoModelIO within Athena
find_path( SQLite3_BINARY_PATH
NAMES sqlite3
PATH_SUFFIXES bin bin64
PATHS ${SQLITE_LCGROOT} )
# Set up the RPM dependency.
lcg_need_rpm( sqlite FOUND_NAME SQLite3 VERSION_NAME SQLITE )
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
#
# Defines:
# - SQLITE_FOUND
# - SQLITE_INCLUDE_DIR
# - SQLITE_INCLUDE_DIRS
# - SQLITE_<component>_FOUND
# - SQLITE_<component>_LIBRARY
# - SQLITE_LIBRARIES
# - SQLITE_LIBRARY_DIR
# - SQLITE_LIBRARY_DIRS
#
# The script can be steered by SQLITE_LCGROOT.
#
# The LCG include(s):
include( LCGFunctions )
# Declare the external module:
lcg_external_module( NAME sqlite
INCLUDE_SUFFIXES include INCLUDE_NAMES sqlite3.h
LIBRARY_SUFFIXES lib
DEFAULT_COMPONENTS sqlite3 )
# Handle the standard find_package arguments:
include( FindPackageHandleStandardArgs )
find_package_handle_standard_args( sqlite DEFAULT_MSG SQLITE_INCLUDE_DIR
SQLITE_LIBRARIES )
mark_as_advanced( SQLITE_FOUND SQLITE_INCLUDE_DIR SQLITE_INCLUDE_DIRS
SQLITE_LIBRARIES SQLITE_LIBRARY_DIRS )
# Set up the RPM dependency:
lcg_need_rpm( sqlite )
......@@ -57,3 +57,12 @@ atlas_add_test( utexec_logpattern
"\${ATLAS_CTEST_LOG_IGNORE_PATTERN} = 'pat2.*|pat3'"
LOG_SELECT_PATTERN "^.*pat1$"
LOG_IGNORE_PATTERN "pat2.*|pat3" )
atlas_add_test( utexec_environment
SCRIPT "echo -n \${FOO} && echo -n \${BAR}"
ENVIRONMENT FOO=foo BAR=bar
POST_EXEC_SCRIPT "logContent=`cat utexec_environment.log`
if [[ \"$logContent\" != \"foobar\" ]]
then
exit 1
fi" )
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
#
# Package building GDB as part of the offline software build.
#
......@@ -13,9 +13,9 @@ find_package( xz )
# The source code for GDB.
set( ATLAS_GDB_SOURCE
"http://cern.ch/atlas-software-dist-eos/externals/Gdb/gdb-10.2.tar.xz"
"http://cern.ch/atlas-software-dist-eos/externals/Gdb/gdb-11.1.tar.xz"
CACHE STRING "GDB source file to use" )
set( ATLAS_GDB_HASH "c044b7146903ec51c9d2337a29aee93b"
set( ATLAS_GDB_HASH "257cb0f67927f79acf636d8c01e19990"
CACHE STRING "MD5 hash for the GDB source file" )
mark_as_advanced( ATLAS_GDB_SOURCE ATLAS_GDB_HASH )
......
......@@ -15,7 +15,7 @@ endif()
atlas_subdir( GeoModel )
# External dependencies.
find_package( sqlite ) # we find the LCG package for SQlite3, called 'sqlite'
find_package( SQLite3 )
if( NOT ATLAS_BUILD_NLOHMANN_JSON )
find_package( nlohmann_json )
endif()
......@@ -63,7 +63,7 @@ ExternalProject_Add( GeoModel
GIT_TAG "${ATLAS_GEOMODEL_TAG}"
CMAKE_CACHE_ARGS
-DCMAKE_PREFIX_PATH:PATH=${_prefixPaths}
-DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES:PATH=${SQLITE_INCLUDE_DIR}
-DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES:PATH=${SQLite3_INCLUDE_DIR}
-DCMAKE_INSTALL_LIBDIR:PATH=${CMAKE_INSTALL_LIBDIR}
-DCMAKE_INSTALL_PREFIX:PATH=${_buildDir}
-DGEOMODEL_BUILD_TOOLS:BOOL=TRUE
......
......@@ -26,5 +26,4 @@
+ External/triSYCL
+ External/yampl
+ External/nlohmann_json
+ External/cppcheck
- .*