Commit f8626725 authored by cyrush's avatar cyrush
Browse files

merge from 2.0RC: osx install name patches for vtk pyton module & enabled python filters by default

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@10229 18c085ea-50e0-402c-830e-de6fd14e8384
parent 30de0609
......@@ -41,6 +41,9 @@
# Cyrus Harrison, Fri Feb 19 15:41:04 PST 2010
# Added install of vtk python wrappers (if they exist).
#
# Cyrus Harrison, Tue Mar 9 07:51:00 PST 2010
# Added install_name_tool patch of of vtk python wrappers (if they exist)
#
#****************************************************************************/
INCLUDE(${VISIT_SOURCE_DIR}/CMake/ThirdPartyInstallLibrary.cmake)
......@@ -150,6 +153,27 @@ IF(EXISTS ${VTK_PY_WRAPPERS_DIR})
FILE_PERMISSIONS OWNER_WRITE OWNER_READ GROUP_WRITE GROUP_READ WORLD_READ
DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_WRITE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
)
#
# On OSX we need to patch the lib names in the vtk python wrappers.
#
# Obtain a list of all '.so' libs from the module source directory and
# use these names to create an install rule that executes 'osxfixup'.
# Yes - VTK generates '.so's here instead of 'dylib's ...
#
IF(APPLE)
FILE(GLOB vtkpylibs ${VTK_PY_MODULE}/*so)
FOREACH(vtkpylib ${vtkpylibs})
GET_FILENAME_COMPONENT(libname ${vtkpylib} NAME)
INSTALL(CODE
"EXECUTE_PROCESS(WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}
COMMAND /bin/sh ${VISIT_SOURCE_DIR}/CMake/osxfixup -lib
${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_LIB}/site-packages/vtk/${libname}
OUTPUT_VARIABLE OSXOUT)
MESSAGE(STATUS \"\${OSXOUT}\")
")
ENDFOREACH(vtkpylib ${vtkpylibs})
ENDIF(APPLE)
SET(VTK_PYTHON_WRAPPERS_FOUND TRUE)
ELSE(EXISTS ${VTK_PY_WRAPPERS_DIR})
SET(VTK_PYTHON_WRAPPERS_FOUND FALSE)
......
......@@ -85,6 +85,9 @@
# Modified the logic that sets the VISIT_SVN_REVISION to get it from
# the file SVN_REVISION before trying svn to get it.
#
# Cyrus Harrison, Tue Mar 9 08:02:50 PST 2010
# Enabled python filters support by default.
#
#****************************************************************************/
CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4 FATAL_ERROR)
......@@ -195,7 +198,7 @@ IF(VISIT_STATIC)
ADD_DEFINITIONS(-DVISIT_STATIC -DGLEW_STATIC)
ENDIF(VISIT_STATIC)
OPTION(VISIT_PYTHON_SCRIPTING "Build VisIt with Python scripting support." ON)
OPTION(VISIT_PYTHON_FILTERS "Build VisIt with Python Engine Filter support." OFF)
OPTION(VISIT_PYTHON_FILTERS "Build VisIt with Python Engine Filter support." ON)
# VTK Python's wrappers avalaible with the static libs, so we cannot support
# python filters in a static build
......
......@@ -837,6 +837,9 @@
# Hank Childs, Sun Feb 28 13:28:05 PST 2010
# Make IceT builds be automatic if you enable parallel builds.
#
# Cyrus Harrison, Tue Mar 9 07:52:50 PST 2010
# Install name patching for vtk python module on OSX.
#
# *****************************************************************************
# #
# *************************************************************************** #
......@@ -3906,6 +3909,42 @@ function build_vtk
$VISITDIR/vtk/${VTK_VERSION}/${VISITARCH}/lib/$i.$SO_EXT
done
done
#
# Fix vtk python wrapper module intall names.
#
for i in libvtkCommonPython.so libvtkFilteringPython.so libvtkGenericFilteringPython.so \
libvtkGraphicsPython.so libvtkHybridPython.so libvtkIOPython.so libvtkImagingPython.so \
libvtkRenderingPython.so libvtkVolumeRenderingPython.so
do
install_name_tool -id \
$INSTALLNAMEPATH/python${PYTHON_COMPATIBILITY_VERSION}/site-packages/vtk/$i \
$VISITDIR/vtk/${VTK_VERSION}/${VISITARCH}/lib/python${PYTHON_COMPATIBILITY_VERSION}/site-packages/vtk/$i
done
#
# The vtk python module libs depend on the main vtk libs, resolve these install names.
#
for i in libvtkCommonPython.so libvtkFilteringPython.so libvtkGenericFilteringPython.so \
libvtkGraphicsPython.so libvtkHybridPython.so libvtkIOPython.so libvtkImagingPython.so \
libvtkRenderingPython.so libvtkVolumeRenderingPython.so
do
for j in libvtkCommon libvtkCommonPythonD libvtkDICOMParser libvtkFiltering \
libvtkFilteringPythonD libvtkGenericFiltering libvtkGenericFilteringPythonD \
libvtkGraphics libvtkGraphicsPythonD libvtkHybrid libvtkHybridPythonD libvtkIO \
libvtkIOPythonD libvtkImaging libvtkImagingPythonD libvtkMPEG2Encode libvtkRendering \
libvtkRenderingPythonD libvtkVolumeRendering libvtkVolumeRenderingPythonD libvtkexpat \
libvtkfreetype libvtkftgl libvtkjpeg libvtkpng libvtksys \
libvtktiff libvtkzlib
do
install_name_tool -change \
$j.5.0.$SO_EXT \
$INSTALLNAMEPATH/$j.$SO_EXT \
$VISITDIR/vtk/${VTK_VERSION}/${VISITARCH}/lib/python${PYTHON_COMPATIBILITY_VERSION}/site-packages/vtk/$i
done
done
fi
#
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment