From e5246ef8c1e81d9163bec0bb4dc596354af3b83e Mon Sep 17 00:00:00 2001 From: Johannes Elmsheuser <johannes.elmsheuser@cern.ch> Date: Fri, 2 Sep 2016 09:14:27 +0200 Subject: [PATCH] Tagging AtlasLCG-00-00-69 (AtlasLCG-00-00-69) * Modfiy Findpyanalysis.cmake to use site.py instead of numpy/__init__.py to find the PYTHONPATH 2016-09-01 Johannes Elmsheuser <Johannes.Elmsheuser@cern.ch> * Modfiy Findpytools.cmake to use site.py instead of mock.py to find the PYTHONPATH Former-commit-id: bd0c6ec67aa75a4e013ff28ec0397e2691d11c81 --- Build/AtlasLCG/modules/Findpyanalysis.cmake | 4 ++-- Build/AtlasLCG/modules/Findpytools.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Build/AtlasLCG/modules/Findpyanalysis.cmake b/Build/AtlasLCG/modules/Findpyanalysis.cmake index 450ac450ce5..35c9549eae1 100644 --- a/Build/AtlasLCG/modules/Findpyanalysis.cmake +++ b/Build/AtlasLCG/modules/Findpyanalysis.cmake @@ -1,6 +1,6 @@ # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -# $Id: Findpyanalysis.cmake 723053 2016-02-10 11:00:16Z krasznaa $ +# $Id: Findpyanalysis.cmake 771424 2016-09-02 09:14:08Z elmsheus $ # # Sets: # PYANALYSIS_BINARY_PATH @@ -22,7 +22,7 @@ find_path( PYANALYSIS_BINARY_PATH isympy PATH_SUFFIXES bin PATHS ${PYANALYSIS_ROOT} ) # Find the python path: -find_path( PYANALYSIS_PYTHON_PATH numpy/__init__.py +find_path( PYANALYSIS_PYTHON_PATH site.py PATH_SUFFIXES lib/python2.7/site-packages PATHS ${PYANALYSIS_ROOT} ) diff --git a/Build/AtlasLCG/modules/Findpytools.cmake b/Build/AtlasLCG/modules/Findpytools.cmake index 15efc28f3ad..4cf9d29ffb6 100644 --- a/Build/AtlasLCG/modules/Findpytools.cmake +++ b/Build/AtlasLCG/modules/Findpytools.cmake @@ -1,6 +1,6 @@ # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -# $Id: Findpytools.cmake 722366 2016-02-08 10:06:10Z krasznaa $ +# $Id: Findpytools.cmake 771318 2016-09-01 14:55:33Z elmsheus $ # # Sets: # PYTOOLS_BINARY_PATH @@ -22,7 +22,7 @@ find_path( PYTOOLS_BINARY_PATH ipython PATH_SUFFIXES bin PATHS ${PYTOOLS_ROOT} ) # Find the python path: -find_path( PYTOOLS_PYTHON_PATH mock.py +find_path( PYTOOLS_PYTHON_PATH site.py PATH_SUFFIXES lib/python2.7/site-packages PATHS ${PYTOOLS_ROOT} ) -- GitLab