Commit dd4a5100 authored by ghweber's avatar ghweber
Browse files

MacOS fix for VTK. Snow Leopard build fix. Clean-up.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@8921 18c085ea-50e0-402c-830e-de6fd14e8384
parent 86967abf
......@@ -193,6 +193,9 @@
# Tom Fogal, Fri Nov 6 18:01:11 MST 2009
# Add X_CPPFLAGS to compilation flags.
#
# Gunther H. Weber, Tue Nov 10 19:47:23 PST 2009
# Added @OVERLAY_INC@ to compilation flags.
#
##############################################################################
##
......@@ -278,7 +281,7 @@ avtVolumeVariableLegend.C \
$(RENDERING_SRC)
CPPFLAGS=-Ivtk -I../../include/visit @COMPONENT_CPPFLAGS@ @CPPFLAGS@ $(GLEW_INCLUDE) \
@X_CPPFLAGS@
@X_CPPFLAGS@ @OVERLAY_INC@
SEROBJ=$(SRC:.C=.o) $(SEROPENGL_OBJ) @SERMESA_OBJ@
PAROBJ=$(SRC:.C=_par.o) $(PAROPENGL_OBJ) @PARMESA_OBJ@
LIB=libplotter
......
......@@ -18,7 +18,7 @@ MESA=$VISITHOME/mesa/7.5/$VISITARCH
##
## Specify the location of the vtk include files and libraries.
##
VTK=$VISITHOME/vtk/5.0.0c/$VISITARCH
VTK=$VISITHOME/vtk/5.0.0d/$VISITARCH
##
## Specify the location of cmake.
......
......@@ -31,6 +31,9 @@ class DBOptionsAttributes;
// Gunther H. Weber, Fri Apr 17 13:03:47 PDT 2009
// Added option to reject file if FastBit index is present.
//
// Gunther H. Weber, Tue Nov 10 19:48:28 PST 2009
// Removed unused data members.
//
// ****************************************************************************
class avtH5PartFileFormat : public avtMTMDFileFormat
......@@ -73,8 +76,6 @@ class avtH5PartFileFormat : public avtMTMDFileFormat
virtual void PopulateDatabaseMetaData(avtDatabaseMetaData *, int);
std::vector<std::vector<float> > pointvars; //point variables
std::vector<std::string> pointvarnames; //point variables' names
std::vector<float> minExtents; //min extents
std::vector<float> maxExtents; //max extents
// H5Block
std::vector< std::string > fieldNames;
......
......@@ -726,6 +726,9 @@
# supported option before, but it failed to properly download and/or build
# Mesa, CMake, and Python.
#
# Gunther H. Weber, Tue Nov 10 19:46:08 PST 2009
# Change install_name for VTK on MacOS.
#
# *****************************************************************************
# #
# *************************************************************************** #
......@@ -3558,6 +3561,58 @@ function build_vtk
return 1
fi
#
# If on Darwin, fix install names
#
if [[ "$OPSYS" == "Darwin" ]]; then
if [[ $ABS_PATH == "Yes" ]]; then
INSTALLNAMEPATH="$VISITDIR/vtk/${VTK_VERSION}/$VISITARCH/lib"
else
INSTALLNAMEPATH="@executable_path/../lib"
fi
# fix the internal name with in the libraries
#
# first change the libraries name and identification by executing the
# following bourne shell script
for i 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 -id \
$INSTALLNAMEPATH/$i.$SO_EXT \
$VISITDIR/vtk/${VTK_VERSION}/${VISITARCH}/lib/$i.$SO_EXT
done
#
# Next change the dependent libraries names and paths
for i 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
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/$i.$SO_EXT
done
done
fi
#
# Manually install the Mangled Mesa headers
#
......
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