Commit 45da64a2 authored by hkrishna's avatar hkrishna

several build_visit updates. gdal removed without-libtool and without-expat,...

several build_visit updates. gdal removed without-libtool and without-expat, added with-hidden-internal-variable to solve user error, hdf4 reverted changes to 4.2.5, pyside added QT dependency, xdmf made build depend on visit-vtk 5.8, helper_funcs modified no-cancel to nocancel, visit added xdmf patch to FindXdmf.cmake

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@16814 18c085ea-50e0-402c-830e-de6fd14e8384
parent a1821a14
......@@ -48,4 +48,4 @@
INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
SET_UP_THIRD_PARTY(XDMF lib include Xdmf vtklibxml2)
SET_UP_THIRD_PARTY(XDMF lib include Xdmf)
......@@ -158,12 +158,12 @@ function build_gdal
info "Invoking command to configure GDAL"
if [[ "$OPSYS" == "Darwin" ]]; then
if [[ "$DO_STATIC_BUILD" == "no" ]]; then
EXTRA_FLAGS="F77=\"\" --enable-shared --disable-static"
EXTRA_FLAGS="F77=\"\" --enable-shared --disable-static --without-libtool --without-expat"
else
EXTRA_FLAGS="F77=\"\" --enable-static --without-ld-shared"
EXTRA_FLAGS="F77=\"\" --enable-static --without-ld-shared --without-libtool --without-expat"
fi
else
EXTRA_FLAGS="--enable-static --disable-shared"
EXTRA_FLAGS="--enable-static --disable-shared --with-hide-internal-symbols"
fi
if [[ "$OPSYS" == "Darwin" ]]; then
......@@ -188,7 +188,7 @@ function build_gdal
--with-libz=internal --with-netcdf=no \
--with-pg=no --with-curl=no \
--without-jasper --without-python \
--without-libtool --without-sqlite3 --without-expat
--without-sqlite3
if [[ $? != 0 ]] ; then
warn "GDAL configure failed. Giving up"
return 1
......
......@@ -1312,7 +1312,7 @@ function build_hdf4
fi
if [[ "$FC_COMPILER" == "no" ]] ; then
FORTRANARGS=""
FORTRANARGS="--disable-fortran"
else
FORTRANARGS="FC=\"$FC_COMPILER\" F77=\"$FC_COMPILER\" FCFLAGS=\"$FCFLAGS\" FFLAGS=\"$FCFLAGS\" --enable-fortran"
fi
......@@ -1333,7 +1333,7 @@ function build_hdf4
--prefix=\"$VISITDIR/hdf4/$HDF4_VERSION/$VISITARCH\" \
--with-jpeg=\"$VISITDIR/vtk/${VTK_VERSION}/$VISITARCH\" \
--with-szlib=\"$VISITDIR/szip/$SZIP_VERSION/$VISITARCH\" \
--disable-dependency-tracking --disable-fortran"
--disable-dependency-tracking"
if [[ $? != 0 ]] ; then
warn "HDF4 configure failed. Giving up"\
"You can see the details of the build failure at $HDF4_BUILD_DIR/config.log\n"
......@@ -1348,10 +1348,10 @@ function build_hdf4
CFLAGS=\"$CFLAGS $C_OPT_FLAGS\" LIBS=\"-lm\" \
CPPFLAGS=\"-I$VISITDIR/vtk/${VTK_VERSION}/$VISITARCH/include/ \
-I$VISITDIR/vtk/${VTK_VERSION}/$VISITARCH/include/vtkjpeg\" \
$FOTRANARGS \
$FORTRANARGS \
--prefix=\"$VISITDIR/hdf4/$HDF4_VERSION/$VISITARCH\" \
--with-jpeg=\"$VISITDIR/vtk/${VTK_VERSION}/$VISITARCH\" \
--with-szlib=\"$VISITDIR/szip/$SZIP_VERSION/$VISITARCH\" --disable-fortran"
--with-szlib=\"$VISITDIR/szip/$SZIP_VERSION/$VISITARCH\""
if [[ $? != 0 ]] ; then
warn "HDF4 configure failed. Giving up.\n"\
"You can see the details of the build failure at $HDF4_BUILD_DIR/config.log\n"
......@@ -1364,7 +1364,7 @@ function build_hdf4
#
info "Building HDF4 . . . (~2 minutes)"
env AM_LDFLAGS="-L$VISITDIR/vtk/${VTK_VERSION}/$VISITARCH/lib -lvtkjpeg" $MAKE $MAKEOPS
$MAKE $MAKEOPS
if [[ $? != 0 ]] ; then
warn "HDF4 build failed. Giving up"
return 1
......
......@@ -8,6 +8,8 @@ function bv_pyside_enable
{
DO_PYSIDE="yes"
ON_PYSIDE="on"
DO_QT="yes"
ON_QT="on"
}
function bv_pyside_disable
......
......@@ -61,7 +61,7 @@ function bv_visit_info
#print variables used by this module
function bv_visit_print
{
printf "%s%s\n" "VISIT_FILE=" "${VISIT:_FILE}"
printf "%s%s\n" "VISIT_FILE=" "${VISIT_FILE}"
printf "%s%s\n" "VISIT_VERSION=" "${VISIT_VERSION}"
#printf "%s%s\n" "VISIT_COMPATIBILITY_VERSION=" "${VISIT_COMPATIBILITY_VERSION}"
#printf "%s%s\n" "VISIT_BUILD_DIR=" "${VISIT_BUILD_DIR}"
......@@ -169,6 +169,22 @@ function build_visit
fi
cp $START_DIR/$(hostname).cmake config-site
#Todo: remove on 2.4.1, patch FindXdmf.cmake to remove libvtklibxml2
# this is being removed since vtk provides this file now..
info "patching removal of libvtklibxml2 from xdmf"
patch -s -d CMake/ -p0 << \EOF
Index: FindXdmf.cmake
===================================================================
--- FindXdmf.cmake (revision 16802)
+++ FindXdmf.cmake (working copy)
@@ -48,4 +48,4 @@
INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
-SET_UP_THIRD_PARTY(XDMF lib include Xdmf vtklibxml2)
+SET_UP_THIRD_PARTY(XDMF lib include Xdmf)
EOF
#
# Call configure
#
......
......@@ -124,12 +124,7 @@ function build_xdmf
# We need to patch the CMakeLists.txt so it uses our HDF5 by default
# when we tell it to use the system versions.
cd $XDMF_BUILD_DIR || error "Can't cd to Xdmf build dir."
rm CML.*
mv CMakeLists.txt CML.0
H5DIR=$(echo "$VISITDIR/hdf5/$HDF5_VERSION/$VISITARCH" | sed "s/\//\\\\\//g")
sed "s/ hdf5/ hdf5 $H5DIR\/lib NO_DEFAULT_PATH/g" CML.0 > CML.1
sed "s/H5Ipublic.h/H5Ipublic.h $H5DIR\/include NO_DEFAULT_PATH/g" CML.1 > CMakeLists.txt
rm -f CMakeCache.txt #remove any CMakeCache that may have existed
# Configure Xdmf
info "Executing CMake on Xdmf"
if [[ "$DO_STATIC_BUILD" == "yes" ]]; then
......@@ -139,18 +134,7 @@ function build_xdmf
XDMF_SHARED_LIBS="ON"
LIBEXT="${SO_EXT}"
fi
if [[ "$OPSYS" == "Darwin" ]]; then
# Work around build problems on Mac.
XDMF_ZLIB_OPTIONS="-DXDMF_SYSTEM_ZLIB:BOOL=OFF"
cd Utilities/vtklibxml2
rm CML.*
mv CMakeLists.txt CML.0
sed "s/SET(LIBXML2_LIBS \"\")/SET(LIBXML2_LIBS \"vtkzlib\")/g" CML.0 > CML.1
sed "s/SET(WITH_MODULES 1)/SET(WITH_MODULES 0)/g" CML.1 > CMakeLists.txt
cd ../..
else
XDMF_ZLIB_OPTIONS="-DXDMF_SYSTEM_ZLIB:BOOL=ON"
fi
${CMAKE_BIN} -DCMAKE_INSTALL_PREFIX:PATH="$VISITDIR/Xdmf/${XDMF_VERSION}/${VISITARCH}"\
-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \
-DBUILD_SHARED_LIBS:BOOL=${XDMF_SHARED_LIBS}\
......@@ -162,8 +146,15 @@ function build_xdmf
-DXDMF_BUILD_MPI:BOOL=OFF \
-DXDMF_BUILD_VTK:BOOL=OFF \
-DXDMF_BUILD_UTILS:BOOL=OFF \
${XDMF_ZLIB_OPTIONS}\
-DXDMF_SYSTEM_HDF5:BOOL=ON \
-DHDF5_INCLUDE_PATH:PATH="$VISITDIR/hdf5/$HDF5_VERSION/$VISITARCH/include" \
-DHDF5_LIBRARY:PATH="$VISITDIR/hdf5/$HDF5_VERSION/$VISITARCH/lib/libhdf5.${SO_EXT}" \
-DXDMF_SYSTEM_ZLIB:BOOL=ON \
-DZLIB_INCLUDE_PATH:PATH="$VISITDIR/vtk/$VTK_VERSION/$VISITARCH/include/vtklibz" \
-DZLIB_LIBRARY:PATH="$VISITDIR/vtk/$VTK_VERSION/$VISITARCH/lib/libvtkzlib.${SO_EXT}" \
-DXDMF_SYSTEM_LIBXML2:BOOL=ON \
-DLIBXML2_INCLUDE_PATH:PATH="$VISITDIR/vtk/$VTK_VERSION/$VISITARCH/include/vtklibxml2" \
-DLIBXML2_LIBRARY="$VISITDIR/vtk/$VTK_VERSION/$VISITARCH/lib/libvtklibxml2.${SO_EXT}" \
.
if [[ $? != 0 ]] ; then
......@@ -190,16 +181,12 @@ function build_xdmf
return 1
fi
# Patch up the library names on Darwin
if [[ "$DO_STATIC_BUILD" != "yes" && "$OPSYS" == "Darwin" ]]; then
LIBDIR="$VISITDIR/Xdmf/${XDMF_VERSION}/${VISITARCH}/lib"
install_name_tool -change libvtklibxml2.dylib $LIBDIR/libvtklibxml2.dylib \
-change libvtkzlib.dylib $VISITDIR/vtk/${VTK_VERSION}/${VISITARCH}/lib/libvtkzlib.dylib \
-id $LIBDIR/libXdmf.dylib $LIBDIR/libXdmf.dylib
install_name_tool -change libvtkzlib.dylib $VISITDIR/vtk/${VTK_VERSION}/${VISITARCH}/lib/libvtkzlib.dylib \
-id $LIBDIR/libvtklibxml2.dylib $LIBDIR/libvtklibxml2.dylib
install_name_tool -id $LIBDIR/libXdmf.dylib $LIBDIR/libXdmf.dylib
fi
if [[ "$DO_GROUP" == "yes" ]] ; then
chmod -R ug+w,a+rX "$VISITDIR/Xdmf"
chgrp -R ${GROUP} "$VISITDIR/Xdmf"
......
......@@ -605,6 +605,11 @@ function check_visit_source_code
# Build using (the assumed) existing VisIt svn "src" directory
elif [[ -d src ]] ; then
info "Found VisIt SVN src directory found, using it."
#resetting any values that have mixup the build between Trunk and RC
VISIT_FILE="" #erase any accidental setting of these values
USE_VISIT_FILE="no"
ON_USE_VISIT_FILE="off"
DO_SVN="yes" #if src directory exists it may have come from svn..
# Build using a VisIt source tarball
else
......
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