From 85180484c3d6d6103ebae6cc2635dc8301130cc0 Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 14 Sep 2016 01:12:39 +0200 Subject: [PATCH] CONFIG: update cmake variables for paraview with python (issue #5) - replace PYTHON_INCLUDE_PATH with PYTHON_INCLUDE_DIRS (changed in paraview 2014-10-30) - add check for Python.h for earlier failure. Eg, when development headers are missing on the system. --- etc/tools/ParaViewFunctions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/tools/ParaViewFunctions b/etc/tools/ParaViewFunctions index 37915f0..c989264 100644 --- a/etc/tools/ParaViewFunctions +++ b/etc/tools/ParaViewFunctions @@ -202,7 +202,7 @@ addPythonSupport() pythonInclude=/usr/include/python$pythonMajor # Note - we could also allow for a PYTHON_INCLUDE variable ... - [ -d "$pythonInclude" ] || { + [ -d "$pythonInclude" -a -f "$pythonInclude/Python.h" ] || { echo " No python headers found in $pythonInclude/" echo " Please install python headers or deactivate " echo " python support by not using the -python option" @@ -210,7 +210,7 @@ addPythonSupport() } addCMakeVariable "PARAVIEW_ENABLE_PYTHON=ON" - addCMakeVariable "PYTHON_INCLUDE_PATH=$pythonInclude" + addCMakeVariable "PYTHON_INCLUDE_DIRS=$pythonInclude" addCMakeVariable "PYTHON_LIBRARY=$PYTHON_LIBRARY" echo "----"