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

Merge branch 'MatplotlibFix-master-20181009' into 'master'

Matplotlib Fix, master branch (2018.10.09.)

Closes ATLINFR-2660

See merge request atlas/atlasexternals!361
parents 162b7687 785af39b
No related branches found
Tags 2.0.13
No related merge requests found
# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
#
# Sets:
# CYCLER_PYTHON_PATH
#
# Can be steered by CYCLER_ROOT.
#
# The LCG include(s):
include( LCGFunctions )
# Dependencies:
find_package( PythonLibs )
find_package( PythonInterp )
# If it was already found, let's be quiet:
if( CYCLER_FOUND )
set( cycler_FIND_QUIETLY TRUE )
endif()
# Ignore system paths when an LCG release was set up:
if( CYCLER_ROOT )
set( _extraClrArgs NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH )
endif()
# Find the python path:
find_path( CYCLER_PYTHON_PATH
NAMES cycler.py cycler/__init__.py
PATH_SUFFIXES lib/python2.7/site-packages
PATHS ${CYCLER_ROOT}
${_extraClrArgs} )
# Handle the standard find_package arguments:
include( FindPackageHandleStandardArgs )
find_package_handle_standard_args( cycler DEFAULT_MSG
CYCLER_PYTHON_PATH PYTHONLIBS_FOUND PYTHONINTERP_FOUND )
# Set up the RPM dependency:
lcg_need_rpm( cycler )
# Clean up:
if( _extraClrArgs )
unset( _extraClrArgs )
endif()
# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
#
# Sets:
# KIWISOLVER_PYTHON_PATH
#
# Can be steered by KIWISOLVER_ROOT.
#
# The LCG include(s):
include( LCGFunctions )
# Dependencies:
find_package( PythonLibs )
find_package( PythonInterp )
# If it was already found, let's be quiet:
if( KIWISOLVER_FOUND )
set( kiwisolver_FIND_QUIETLY TRUE )
endif()
# Ignore system paths when an LCG release was set up:
if( KIWISOLVER_ROOT )
set( _extraKslwArgs NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH )
endif()
# Find the python path:
find_path( KIWISOLVER_PYTHON_PATH
NAMES "kiwisolver${CMAKE_SHARED_LIBRARY_SUFFIX}"
PATH_SUFFIXES lib/python2.7/site-packages
PATHS ${KIWISOLVER_ROOT}
${_extraKslwArgs} )
# Handle the standard find_package arguments:
include( FindPackageHandleStandardArgs )
find_package_handle_standard_args( kiwisolver DEFAULT_MSG
KIWISOLVER_PYTHON_PATH PYTHONLIBS_FOUND PYTHONINTERP_FOUND )
# Set up the RPM dependency:
lcg_need_rpm( kiwisolver )
# Clean up:
if( _extraKslwArgs )
unset( _extraKslwArgs )
endif()
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
#
# Sets:
# PYANALYSIS_BINARY_PATH
......@@ -10,6 +10,12 @@
# The LCG include(s):
include( LCGFunctions )
# Dependencies:
find_package( PythonLibs )
find_package( PythonInterp )
find_package( kiwisolver )
find_package( cycler )
# If it was already found, let's be quiet:
if( PYANALYSIS_FOUND )
set( pyanalysis_FIND_QUIETLY TRUE )
......@@ -35,7 +41,8 @@ find_path( PYANALYSIS_PYTHON_PATH
# Handle the standard find_package arguments:
include( FindPackageHandleStandardArgs )
find_package_handle_standard_args( pyanalysis DEFAULT_MSG
PYANALYSIS_PYTHON_PATH PYANALYSIS_BINARY_PATH )
PYANALYSIS_PYTHON_PATH PYANALYSIS_BINARY_PATH
PYTHONLIBS_FOUND PYTHONINTERP_FOUND )
# Set up the RPM dependency:
lcg_need_rpm( pyanalysis )
......
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