Commit 690a6fcd authored by cyrush's avatar cyrush
Browse files

move to vtk5.0.0d w/ 'make install'ed paths

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@8874 18c085ea-50e0-402c-830e-de6fd14e8384
parent 816a5109
##
## build_vist generated host.conf
## created: Fri Feb 8 11:36:38 PST 2008
## system: Linux beetown.llnl.gov 2.6.20-1smp #1 SMP PREEMPT Wed May 2 18:01:42 PDT 2007 i686 i686 i386 GNU/Linux
## /home/harrison37/svn_dev/svn_bin/build_visit generated host.conf
## created: Thu Aug 6 10:02:57 PDT 2009
## system: Linux beetown.llnl.gov 2.6.18-128.2.1.el5 #1 SMP Wed Jul 8 11:54:54 EDT 2009 i686 i686 i386 GNU/Linux
## by: harrison37
##
## Set the VISITHOME environment variable.
##
VISITHOME=/home/harrison37/svn_dev/visit
VISITHOME=/home/harrison37/hdrive/dev/libs
VISITARCH=linux-i686_gcc-4.1.2
VISITARCH_TK=linux-i686_gcc-4.1
##
## Specify the location of the mesa include files and libraries.
##
MESA=$VISITHOME/mesa/5.0/linux-i686_gcc-3.4.6
MESA=$VISITHOME/mesa/7.5/$VISITARCH
##
## Specify the location of the vtk include files and libraries.
##
VTK=$VISITHOME/vtk/5.0.0c/linux-i686_gcc-3.4.6
VTK=$VISITHOME/vtk/5.0.0d/$VISITARCH_TK
##
## Specify the location of cmake.
##
DEFAULT_CMAKE=$VISITHOME/cmake/2.4.5/linux-i686_gcc-3.4.6/bin/cmake
DEFAULT_CMAKE=$VISITHOME/cmake/2.6.4/$VISITARCH_TK/bin/cmake
##
## Specify the location of the qt include files and libraries.
##
QT_LOC=/home/harrison37/apps/Trolltech/Qt-4.4.3
QT_BIN=$QT_LOC/bin
QT_INCLUDE=$QT_LOC/include
QT_LIB=$QT_LOC/lib
QT_HOME=/home/harrison37/apps/Trolltech/Qt-4.5.2/
QT_BIN=$QT_HOME/bin
QT_INCLUDE=$QT_HOME/include
QT_LIB=$QT_HOME/lib
##
## Specify the location of the python include and libraries.
##
PYDIR=$VISITHOME/python/2.5/linux-i686_gcc-3.4.6
PYDIR=$VISITHOME/python/2.5/$VISITARCH_TK
PYVERSION=python2.5
##
## Compiler flags.
##
CC="gcc"
CXX="g++"
CFLAGS="-g $CFLAGS"
CXXFLAGS="-g $CXXFLAGS"
##
## Turn off warnings for deprecated features.
##
CXXFLAGS="-Wno-deprecated $CXXFLAGS"
##
## Add parallel arguments.
##
LDFLAGS="-L/misc/gapps/mpich/1.2.4/Linux/serial/64/debug/lib $LDFLAGS"
CPPFLAGS="-I/misc/gapps/mpich/1.2.4/Linux/serial/64/debug/include $CPPFLAGS"
MPI_LIBS="-lmpich"
CFLAGS="-g $CFLAGS"
CXXFLAGS="-g -Wno-deprecated $CXXFLAGS"
##
## If enable_viewer_mesa_stub in not set, then disable it.
##
if test -z "$enable_viewer_mesa_stub"; then
enable_viewer_mesa_stub=no
fi
OPENMPI_DIR="/home/harrison37/apps/openmpi/1.3.3/"
LDFLAGS="$LDFLAGS -pthread -L$OPENMPI_DIR/lib "
CPPFLAGS="-I$OPENMPI_DIR/include $CPPFLAGS"
MPI_LIBS="-lmpi_cxx -lmpi -lopen-rte -lopen-pal -ldl -Wl,--export-dynamic -lnsl -lutil -lm -ldl"
##
......@@ -74,73 +63,87 @@ fi
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=$VISITHOME/boxlib/linux-i686_gcc-3.4.6/include/2D
DEFAULT_BOXLIB2D_LIBS=$VISITHOME/boxlib/linux-i686_gcc-3.4.6/lib
DEFAULT_BOXLIB3D_INCLUDE=$VISITHOME/boxlib/linux-i686_gcc-3.4.6/include/3D
DEFAULT_BOXLIB3D_LIBS=$VISITHOME/boxlib/linux-i686_gcc-3.4.6/lib
DEFAULT_BOXLIB2D_INCLUDE=$VISITHOME/boxlib/$VISITARCH/include/2D
DEFAULT_BOXLIB2D_LIBS=$VISITHOME/boxlib/$VISITARCH/lib
DEFAULT_BOXLIB3D_INCLUDE=$VISITHOME/boxlib/$VISITARCH/include/3D
DEFAULT_BOXLIB3D_LIBS=$VISITHOME/boxlib/$VISITARCH/lib
##
## CFITSIO
##
DEFAULT_CFITSIO_INCLUDE=$VISITHOME/cfitsio/3006/linux-i686_gcc-3.4.6/include
DEFAULT_CFITSIO_LIB=$VISITHOME/cfitsio/3006/linux-i686_gcc-3.4.6/lib
DEFAULT_CFITSIO_INCLUDE=$VISITHOME/cfitsio/3006/$VISITARCH/include
DEFAULT_CFITSIO_LIB=$VISITHOME/cfitsio/3006/$VISITARCH/lib
##
## CGNS
##
DEFAULT_CGNS_INCLUDE=$VISITHOME/cgns/2.4/linux-i686_gcc-3.4.6/include
DEFAULT_CGNS_LIB=$VISITHOME/cgns/2.4/linux-i686_gcc-3.4.6/lib
DEFAULT_CGNS_INCLUDE=$VISITHOME/cgns/2.4/$VISITARCH/include
DEFAULT_CGNS_LIB=$VISITHOME/cgns/2.4/$VISITARCH/lib
##
## Exodus
##
DEFAULT_EXODUS_INCLUDES=$VISITHOME/exodus/4.46/linux-i686_gcc-3.4.6/inc
DEFAULT_EXODUS_LIBRARY=$VISITHOME/exodus/4.46/linux-i686_gcc-3.4.6/lib
DEFAULT_EXODUS_INCLUDES=$VISITHOME/exodus/4.46/$VISITARCH/inc
DEFAULT_EXODUS_LIBRARY=$VISITHOME/exodus/4.46/$VISITARCH/lib
##
## GDAL
##
DEFAULT_GDAL_INCLUDE=$VISITHOME/gdal/1.3.2/linux-i686_gcc-3.4.6/include
DEFAULT_GDAL_LIB=$VISITHOME/gdal/1.3.2/linux-i686_gcc-3.4.6/lib
DEFAULT_GDAL_INCLUDE=$VISITHOME/gdal/1.3.2/$VISITARCH/include
DEFAULT_GDAL_LIB=$VISITHOME/gdal/1.3.2/$VISITARCH/lib
##
## H5Part
##
DEFAULT_H5PART_INCLUDE=$VISITHOME/h5part/1.4.0/linux-i686_gcc-3.4.6/include
DEFAULT_H5PART_LIB=$VISITHOME/h5part/1.4.0/linux-i686_gcc-3.4.6/lib
DEFAULT_H5PART_INCLUDE=$VISITHOME/h5part/1.4.2/$VISITARCH/include
DEFAULT_H5PART_LIB=$VISITHOME/h5part/1.4.2/$VISITARCH/lib
##
## FastBit
##
DEFAULT_FASTBIT_INCLUDE=$VISITHOME/fastbit/1.0.9/linux-i686_gcc-4.1.2/include
DEFAULT_FASTBIT_LIB=$VISITHOME/fastbit/1.0.9/linux-i686_gcc-4.1.2/lib
##
## HDF4
##
DEFAULT_HDF4_FLAGS=$VISITHOME/hdf4/4.2.1/linux-i686_gcc-3.4.6/include
DEFAULT_HDF4_LIBS=$VISITHOME/hdf4/4.2.1/linux-i686_gcc-3.4.6/lib
DEFAULT_SZIP_LIB=$VISITHOME/szip/2.1/linux-i686_gcc-3.4.6/lib
DEFAULT_HDF4_FLAGS=$VISITHOME/hdf4/4.2.1/$VISITARCH/include
DEFAULT_HDF4_LIBS=$VISITHOME/hdf4/4.2.1/$VISITARCH/lib
##
## HDF5
##
DEFAULT_HDF5_LIBLOC=$VISITHOME/hdf5/1.6.5/linux-i686_gcc-3.4.6
DEFAULT_HDF5_LIBDEP=-L$VISITHOME/szip/2.1/linux-i686_gcc-3.4.6/lib,-lsz
DEFAULT_HDF5_LIBLOC=$VISITHOME/hdf5/1.8.2/$VISITARCH
DEFAULT_HDF5_LIBDEP=-L$VISITHOME/szip/2.1/$VISITARCH/lib,-lsz
##
## Mili
##
BV_MILI_DIR=$VISITHOME/mili/1.10.0/linux-i686_gcc-3.4.6
DEFAULT_MILI_DIR=$VISITHOME/mili/1.10.0/$VISITARCH
##
## NetCDF
##
DEFAULT_NETCDF_INCLUDE=$VISITHOME/netcdf/3.6.0/linux-i686_gcc-3.4.6/include
DEFAULT_NETCDF_LIB=$VISITHOME/netcdf/3.6.0/linux-i686_gcc-3.4.6/lib
DEFAULT_NETCDF_INCLUDE=$VISITHOME/netcdf/3.6.3/$VISITARCH/include
DEFAULT_NETCDF_LIB=$VISITHOME/netcdf/3.6.3/$VISITARCH/lib
##
## SZIP
##
DEFAULT_SZIP_LIB=$VISITHOME/szip/2.1/$VISITARCH/lib
##
## CCMIO
##
DEFAULT_CCMIO_INCLUDE=$VISITHOME/ccmio/2.6.1/linux-i686_gcc-3.4.6/include
DEFAULT_CCMIO_LIB=$VISITHOME/ccmio/2.6.1/linux-i686_gcc-3.4.6/lib
DEFAULT_CCMIO_INCLUDE=$VISITHOME/ccmio/2.6.1/$VISITARCH/include
DEFAULT_CCMIO_LIB=$VISITHOME/ccmio/2.6.1/$VISITARCH/lib
##
## SILO (must be after HDF5 symbols to reference them correctly)
## Silo
##
DEFAULT_SILO_LIBLOC=$VISITHOME/silo/4.6.2/linux-i686_gcc-3.4.6
DEFAULT_SILO_LIBLOC=$VISITHOME/silo/4.7/$VISITARCH
DEFAULT_SILO_LIBDEP=-L$DEFAULT_HDF5_LIBLOC/lib,-lhdf5,$DEFAULT_HDF5_LIBDEP
##
## Ice-T
##
DEFAULT_ICET_INCLUDE=$VISITHOME/icet/0.5.4/$VISITARCH/include
DEFAULT_ICET_LIB=$VISITHOME/icet/0.5.4/$VISITARCH/lib
##
......@@ -3,19 +3,20 @@
##
VISITHOME=/project/projectdirs/visit/visit_3rdparty
ARCH=linux-ia64_gcc-4.1.2
ARCH_SHORT=linux-ia64_gcc-4.1
##
## If MESA is not set, use VisIt's mesa.
##
if test -z "$MESA"; then
MESA=$VISITHOME/mesa/7.5/$ARCH
MESA=$VISITHOME/mesa/7.5/$ARCH_SHORT
fi
##
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/5.0.0c/$ARCH
VTK=$VISITHOME/vtk/5.0.0d/$ARCH_SHORT
fi
##
......@@ -28,7 +29,7 @@ QT_LIB=$VISITHOME/qt/4.4.3/$ARCH/lib
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/2.5/$ARCH
PYDIR=$VISITHOME/python/2.5/$ARCH_SHORT
PYVERSION=python2.5
##
......@@ -41,7 +42,7 @@ DEFAULT_ICET_LIB="${VISITHOME}/icet/1.0.0/${ARCH}/lib"
##
## Tell VisIt where to find cmake in case we want to build slivr.
##
DEFAULT_CMAKE=$VISITHOME/cmake/2.6.2/altix_gcc_3.3.3/bin/cmake
DEFAULT_CMAKE=$VISITHOME/cmake/2.6.4/${ARCH_SHORT}/bin/cmake
##
## Turn off warnings for deprecated features.
......
......@@ -7,14 +7,14 @@ VISITHOME=/usr/gapps/visit
## If MESA is not set, use VisIt's mesa.
##
if test -z "$MESA"; then
MESA=$VISITHOME/mesa/7.5/linux-i686_gcc-3.2.3
MESA=$VISITHOME/mesa/7.5/linux-i686_gcc-3.2/
fi
##
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/5.0.0c-mesa-7.5/linux-i686_gcc-3.2.3
VTK=$VISITHOME/vtk/5.0.0d/linux-i686_gcc-3.2/
fi
##
......@@ -27,13 +27,13 @@ QT_LIB=$VISITHOME/qt/4.4.3/linux_rhel3_gcc_3.2.3/lib
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/2.5/linux_rhel3_gcc_3.2.3
PYDIR=$VISITHOME/python/2.5/linux-i686_gcc-3.2
PYVERSION=python2.5
##
## Tell VisIt where to find cmake in case we want to build slivr.
##
DEFAULT_CMAKE=$VISITHOME/cmake/2.4.5/linux_rhel3_gcc_3.2.3/bin/cmake
DEFAULT_CMAKE=$VISITHOME/cmake/2.6.4/linux-i686_gcc-3.2/bin/cmake
##
## Turn off warnings for deprecated features.
......
......@@ -4072,7 +4072,7 @@ if test -n "$VTK"; then
echo "${ECHO_T}found" >&6
VTK_DIR=$VTK
VTK_INCROOT="$""(TOPDIR)/include/vtk"
VTK_INCLUDES="-I$VTK_INCROOT -I$VTK_INCROOT/Common -I$VTK_INCROOT/Filtering -I$VTK_INCROOT/Graphics -I$VTK_INCROOT/Hybrid -I$VTK_INCROOT/IO -I$VTK_INCROOT/Imaging -I$VTK_INCROOT/Rendering -I$VTK_INCROOT/Utilities"
VTK_INCLUDES="-I$VTK_INCROOT -I$VTK_INCROOT/vtk-5.0"
VTK_LIBS="-lvtkCommon -lvtkDICOMParser -lvtkFiltering -lvtkGraphics -lvtkHybrid -lvtkIO -lvtkImaging -lvtkRendering -lvtkzlib -lvtkexpat -lvtkjpeg -lvtkpng -lvtktiff -lvtkftgl -lvtkfreetype -lvtksys -lvtkMPEG2Encode "
if test "$UNAME" = "Darwin"; then
VTK_LIGHTWEIGHT_LIBS=$VTK_LIBS
......@@ -4082,7 +4082,7 @@ echo "${ECHO_T}found" >&6
 
# Determine whether VTK was built with mangled Mesa support. If it wasn't
# then there is code in VisIt that we do not want to compile.
useMangledMesa=`grep "define VTK_USE_MANGLED_MESA" $VTK/vtkToolkits.h`
useMangledMesa=`grep "define VTK_USE_MANGLED_MESA" $VTK/include/vtk-5.0/vtkToolkits.h`
if test -n "$useMangledMesa" ; then
 
cat >>confdefs.h <<\_ACEOF
......@@ -10879,7 +10879,7 @@ ac_x_header_dirs='
/usr/openwin/share/include'
 
if test "$ac_x_includes" = no; then
# Guess where to find include files, by looking for Intrinsic.h.
# Guess where to find include files, by looking for Xlib.h.
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
......@@ -10887,7 +10887,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <X11/Intrinsic.h>
#include <X11/Xlib.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
......@@ -10914,7 +10914,7 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
 
for ac_dir in $ac_x_header_dirs; do
if test -r "$ac_dir/X11/Intrinsic.h"; then
if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
break
fi
......@@ -10928,18 +10928,18 @@ if test "$ac_x_libraries" = no; then
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
LIBS="-lXt $LIBS"
LIBS="-lX11 $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <X11/Intrinsic.h>
#include <X11/Xlib.h>
int
main ()
{
XtMalloc (0)
XrmInitialize ()
;
return 0;
}
......
......@@ -985,6 +985,9 @@ dnl
dnl Jed Brown, Sat Oct 24 21:57:05 CEST 2009
dnl Don't set QtSql variables; library is unused / not always available.
dnl
dnl Cyrus Harrison, Tue Oct 6 08:56:58 PDT 2009
dnl Changed vtk include paths to reflect a 'make install'ed vtk
dnl installation.
dnl --------------------------------------------------------------------------
dnl
......@@ -1448,7 +1451,7 @@ if test -n "$VTK"; then
AC_MSG_RESULT(found)
VTK_DIR=$VTK
VTK_INCROOT="$""(TOPDIR)/include/vtk"
VTK_INCLUDES="-I$VTK_INCROOT -I$VTK_INCROOT/Common -I$VTK_INCROOT/Filtering -I$VTK_INCROOT/Graphics -I$VTK_INCROOT/Hybrid -I$VTK_INCROOT/IO -I$VTK_INCROOT/Imaging -I$VTK_INCROOT/Rendering -I$VTK_INCROOT/Utilities"
VTK_INCLUDES="-I$VTK_INCROOT -I$VTK_INCROOT/vtk-5.0"
VTK_LIBS="-lvtkCommon -lvtkDICOMParser -lvtkFiltering -lvtkGraphics -lvtkHybrid -lvtkIO -lvtkImaging -lvtkRendering -lvtkzlib -lvtkexpat -lvtkjpeg -lvtkpng -lvtktiff -lvtkftgl -lvtkfreetype -lvtksys -lvtkMPEG2Encode "
if test "$UNAME" = "Darwin"; then
VTK_LIGHTWEIGHT_LIBS=$VTK_LIBS
......@@ -1458,7 +1461,7 @@ if test -n "$VTK"; then
# Determine whether VTK was built with mangled Mesa support. If it wasn't
# then there is code in VisIt that we do not want to compile.
useMangledMesa=`grep "define VTK_USE_MANGLED_MESA" $VTK/vtkToolkits.h`
useMangledMesa=`grep "define VTK_USE_MANGLED_MESA" $VTK/include/vtk-5.0/vtkToolkits.h`
if test -n "$useMangledMesa" ; then
AC_DEFINE(VISIT_USE_MANGLED_MESA, [1], [Enable use of mangled Mesa classes in VisIt.])
MESA_OBJ="$""(MESA_OBJ)"
......
......@@ -47,6 +47,9 @@
# Jeremy Meredith, Thu Sep 6 16:53:41 EDT 2007
# Don't forget to remove the Makefile in distclean.
#
# Cyrus Harrison, Fri Oct 2 15:15:57 PDT 2009
# Modified vtk include dir due to migration to a make installed vtk.
#
##############################################################################
@SET_MAKE@
......@@ -62,7 +65,7 @@ incpython:
incvtk:
$(RM) vtk
ln -s @VTK_DIR@ vtk
ln -s @VTK_DIR@/include vtk
incmesa:
$(RM) mesa
......
......@@ -188,6 +188,10 @@
# Link to tcmalloc_minimal instead of regular version to avoid additional
# dependencies (e.g. unwind) on 64-bit machines.
#
# Cyrus Harrison, Thu Nov 5 10:28:14 PST 2009
# Changed symlink of python lib to correclty pick up shared python lib
# build with '--enable-shared'.
#
##############################################################################
@SET_MAKE@
......@@ -338,9 +342,9 @@ libqui:
pythondir:
if test -n "@PYDIR@"; then \
$(RM) python lib@PYVERSION@.@SHLIB_LIBEXT@ ; \
$(RM) python lib@PYVERSION@.@SHLIB_LIBEXT@* ; \
ln -s @PYDIR@ python ; \
ln -s python/lib/@PYVERSION@/config/$(LIBPYTHON) . ; \
ln -s python/lib/lib@PYVERSION@.@SHLIB_LIBEXT@* . ; \
fi
create_mili_link:
......
This diff is collapsed.
......@@ -264,6 +264,9 @@
// Brad Whitlock, Wed Nov 4 12:42:01 PST 2009
// I removed rendering_visit_vtk and the parallel engine state libs.
//
// Cyrus Harrison, Tue Oct 6 08:56:58 PDT 2009
// Changed vtk include path to reflect a 'make install'ed vtk installation.
//
// ****************************************************************************
class MakefileGeneratorPlugin : public Plugin
......@@ -352,15 +355,8 @@ class MakefileGeneratorPlugin : public Plugin
out << "## Libraries and includes..." << endl;
out << "##" << endl;
out << "VTK_INCLUDE= \\" << endl;
out << " -I"<<vtkdir<<" \\"<<endl;
out << " -I"<<vtkdir<<"/Common \\"<<endl;
out << " -I"<<vtkdir<<"/Filtering \\"<<endl;
out << " -I"<<vtkdir<<"/Graphics \\"<<endl;
out << " -I"<<vtkdir<<"/Hybrid \\"<<endl;
out << " -I"<<vtkdir<<"/IO \\"<<endl;
out << " -I"<<vtkdir<<"/Imaging \\"<<endl;
out << " -I"<<vtkdir<<"/Rendering \\"<<endl;
out << " -I"<<vtkdir<<"/Utilities"<<endl;
out << " -I"<<vtkdir<<"/vtk-5.0/ \\"<<endl;
out << " -I"<<vtkdir<<"/MangleMesaInclude/"<<endl;
if(type == "database")
{
out << "CXXFLAGS=$(CXXFLAGSORIG)";
......
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