Build/AtlasCMake/modules/AtlasDictionaryFunctions.cmake

@@ -669,9 +669,8 @@ function( atlas_generate_reflex_dictionary dictfile dictname )
    set( pcm_name "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/" )
    set( pcm_name "${pcm_name}${CMAKE_SHARED_LIBRARY_PREFIX}" )
    set( pcm_name "${pcm_name}${dictname}_rdict.pcm" )
-   set( rootmap_name "${CMAKE_CURRENT_BINARY_DIR}" )
-   set( rootmap_name "${rootmap_name}${CMAKE_FILES_DIRECTORY}" )
-   set( rootmap_name "${rootmap_name}/${dictname}.dsomap" )
+   set( rootmap_name_rel "${pkgDir}${CMAKE_FILES_DIRECTORY}/${dictname}.dsomap" )
+   set( rootmap_name "${CMAKE_BINARY_DIR}/${rootmap_name_rel}" )
 
    # The library's physical name:
    if( APPLE )
@@ -755,7 +754,7 @@ function( atlas_generate_reflex_dictionary dictfile dictname )
       if( CMAKE_OSX_SYSROOT )
          set( cmd "${cmd} -isysroot ${CMAKE_OSX_SYSROOT}" )
       endif()
-      set( cmd "${cmd} -MM -MT ${rootmap_name} -MF ${dictname}.d" )
+      set( cmd "${cmd} -MM -MT ${rootmap_name_rel} -MF ${dictname}.d" )
       set( cmd "${cmd} ${ARG_HEADER}\n" )
    endif()
    set( cmd "${cmd}${genreflex} ${ARG_HEADER}" )

Build/AtlasCMake/modules/Findtdaq-common.cmake

@@ -54,6 +54,9 @@ if( TDAQ-COMMON_FOUND )
       SET TDAQ_RELEASE_BASE $ENV{TDAQ_RELEASE_BASE} )
 endif()
 
+# Add TDAQ specific dependencies otherwise not provided by Athena:
+find_package( future )
+
 # Add the RPM dependencies:
 if( TDAQ-COMMON_FOUND )
    # Set up a dependency on the main tdaq-common RPM package:

Build/AtlasLCG/LCGConfig.cmake

@@ -308,6 +308,8 @@ function( lcg_setup_packages lcgFile lcgReleaseDir )
                list( APPEND _dependencies YODA )
             elseif( "${CMAKE_MATCH_1}" STREQUAL "thepeg" )
                list( APPEND _dependencies ThePEG )
+            elseif( "${CMAKE_MATCH_1}" STREQUAL "hjets" )
+               list( APPEND _dependencies HJets )
             elseif( "${CMAKE_MATCH_1}" STREQUAL "hijing" )
                list( APPEND _dependencies Hijing )
             elseif( "${CMAKE_MATCH_1}" STREQUAL "hydjet" )

Build/AtlasLCG/modules/FindHJets.cmake

+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#
+# Module finding HJets in the LCG release. Defines:
+#  - HJETS_FOUND
+#  - HJETS_INCLUDE_DIR
+#  - HJETS_INCLUDE_DIRS
+#  - HJETS_LIBRARIES
+#  - HJETS_LIBRARY_DIRS
+#
+# Can be steered by HJETS_LCGROOT.
+#
+
+# The LCG include(s):
+include( LCGFunctions )
+
+# Declare the external module:
+lcg_external_module( NAME HJets
+   INCLUDE_SUFFIXES include INCLUDE_NAMES HJets/Amplitudes/AmplitudeBase.h
+   LIBRARY_SUFFIXES lib lib/HJets
+   COMPULSORY_COMPONENTS HJets${CMAKE_SHARED_LIBRARY_SUFFIX} )
+
+# Handle the standard find_package arguments:
+include( FindPackageHandleStandardArgs )
+find_package_handle_standard_args( HJets DEFAULT_MSG HJETS_INCLUDE_DIR
+   HJETS_LIBRARIES )
+mark_as_advanced( HJETS_FOUND HJETS_INCLUDE_DIR HJETS_INCLUDE_DIRS
+   HJETS_LIBRARIES HJETS_LIBRARY_DIRS )
+
+# Set up the RPM dependency:
+lcg_need_rpm( hjets )

Build/AtlasLCG/modules/FindPango.cmake

@@ -41,10 +41,3 @@ mark_as_advanced( PANGO_FOUND PANGO_INCLUDE_DIR PANGO_INCLUDE_DIRS
 
 # Set up the RPM dependency:
 lcg_need_rpm( pango )
-
-# Set up a dependency on Cairo:
-if( Pango_FIND_QUIETLY )
-   find_package( Cairo QUIET )
-else()
-   find_package( Cairo )
-endif()

Build/AtlasLCG/modules/Findenum34.cmake

+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#
+# Sets:
+#  ENUM34_PYTHON_PATH
+#
+# Can be steered by ENUM34_LCGROOT.
+#
+
+# The LCG include(s):
+include( LCGFunctions )
+
+# Dependencies:
+find_package( PythonLibs )
+find_package( PythonInterp )
+
+# If it was already found, let's be quiet:
+if( ENUM34_FOUND )
+   set( enum34_FIND_QUIETLY TRUE )
+endif()
+
+# Ignore system paths when an LCG release was set up:
+if( ENUM34_LCGROOT )
+   set( _extraEnum34Args NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH )
+endif()
+lcg_system_ignore_path_setup()
+
+# Find the python path:
+find_path( ENUM34_PYTHON_PATH
+   NAMES enum/__init__.py
+   PATH_SUFFIXES lib/python2.7/site-packages
+   PATHS ${ENUM34_LCGROOT}
+   ${_extraEnum34Args} )
+
+# Handle the standard find_package arguments:
+include( FindPackageHandleStandardArgs )
+find_package_handle_standard_args( enum34 DEFAULT_MSG
+   ENUM34_PYTHON_PATH
+   PYTHONLIBS_FOUND PYTHONINTERP_FOUND )
+
+# Set up the RPM dependency:
+lcg_need_rpm( enum34 )
+
+# Clean up:
+if( _extraEnum34Args )
+   unset( _extraEnum34Args )
+endif()

Build/AtlasLCG/modules/Findfuture.cmake

+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#
+# Sets:
+#  FUTURE_BINARY_PATH
+#  FUTURE_PYTHON_PATH
+#
+# Can be steered by FUTURE_LCGROOT.
+#
+
+# The LCG include(s):
+include( LCGFunctions )
+
+# Dependencies:
+find_package( PythonLibs )
+find_package( PythonInterp )
+
+# If it was already found, let's be quiet:
+if( FUTURE_FOUND )
+   set( future_FIND_QUIETLY TRUE )
+endif()
+
+# Ignore system paths when an LCG release was set up:
+if( FUTURE_LCGROOT )
+   set( _extraFutureArgs NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH )
+endif()
+lcg_system_ignore_path_setup()
+
+# Find the binary path:
+find_path( FUTURE_BINARY_PATH futurize
+   PATH_SUFFIXES bin
+   PATHS ${FUTURE_LCGROOT}
+   ${_extraFutureArgs} )
+
+# Find the python path:
+find_path( FUTURE_PYTHON_PATH
+   NAMES future/__init__.py
+   PATH_SUFFIXES lib/python2.7/site-packages
+   PATHS ${FUTURE_LCGROOT}
+   ${_extraFutureArgs} )
+
+# Handle the standard find_package arguments:
+include( FindPackageHandleStandardArgs )
+find_package_handle_standard_args( future DEFAULT_MSG
+   FUTURE_PYTHON_PATH FUTURE_BINARY_PATH
+   PYTHONLIBS_FOUND PYTHONINTERP_FOUND )
+
+# Set up the RPM dependency:
+lcg_need_rpm( future )
+
+# Clean up:
+if( _extraFutureArgs )
+   unset( _extraFutureArgs )
+endif()

Build/AtlasLCG/modules/Findgraphviz.cmake

@@ -40,10 +40,3 @@ mark_as_advanced( GRAPHVIZ_FOUND GRAPHVIZ_INCLUDE_DIR GRAPHVIZ_INCLUDE_DIRS
 
 # Set up the RPM dependency:
 lcg_need_rpm( graphviz )
-
-# Set up a dependency on Pango:
-if( graphviz_FIND_QUIETLY )
-   find_package( Pango QUIET )
-else()
-   find_package( Pango )
-endif()