Commit 4feaeaf6 authored by hkrishna's avatar hkrishna

fixing silo and mpi errors

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@21059 18c085ea-50e0-402c-830e-de6fd14e8384
parent 6b3daece
......@@ -1342,6 +1342,11 @@ FUNCTION(DETECT_MPI_SETTINGS COMP mlibs mflags mlflags mrpath)
ENDFUNCTION(DETECT_MPI_SETTINGS)
IF(VISIT_PARALLEL)
IF(WIN32)
SET(VPFLAGS "PARALLEL MPICH_IGNORE_CXX_SEEK OMPI_SKIP_MPICXX")
ELSE(WIN32)
SET(VPFLAGS "-DPARALLEL -DMPICH_IGNORE_CXX_SEEK -DOMPI_SKIP_MPICXX")
ENDIF(WIN32)
IF(VISIT_MPI_COMPILER)
MESSAGE(STATUS "Setting up MPI using compiler wrapper")
......@@ -1353,6 +1358,8 @@ IF(VISIT_PARALLEL)
VISIT_PARALLEL_RPATH
)
SET(VISIT_PARALLEL_CXXFLAGS ${VISIT_PARALLEL_CFLAGS} CACHE STRING "Parallel CXXFLAGS")
SET(VISIT_PARALLEL_CFLAGS "${VPFLAGS} ${VISIT_PARALLEL_CFLAGS}")
SET(VISIT_PARALLEL_CXXFLAGS "${VPFLAGS} ${VISIT_PARALLEL_CXXFLAGS}")
# Detect the MPI settings that Fortran wants
IF(VISIT_FORTRAN AND VISIT_MPI_FORTRAN_COMPILER)
......@@ -1362,14 +1369,10 @@ IF(VISIT_PARALLEL)
VISIT_PARALLEL_FORTRAN_LINKER_FLAGS
VISIT_PARALLEL_RPATH
)
SET(VISIT_PARALLEL_FORTRAN_FLAGS "${VPFLAGS} ${VISIT_PARALLEL_FORTRAN_FLAGS}")
ENDIF(VISIT_FORTRAN AND VISIT_MPI_FORTRAN_COMPILER)
ELSE(VISIT_MPI_COMPILER)
IF(WIN32)
SET(VPFLAGS "PARALLEL MPICH_IGNORE_CXX_SEEK")
ELSE(WIN32)
SET(VPFLAGS "-DPARALLEL -DMPICH_IGNORE_CXX_SEEK")
ENDIF(WIN32)
IF(VISIT_MPI_LIBS OR VISIT_MPI_FORTRAN_LIBS)
MESSAGE(STATUS "Setting up MPI using user defined flags")
SET(VISIT_PARALLEL_LIBS ${VISIT_MPI_LIBS}
......
......@@ -168,7 +168,7 @@ function build_silo
WITHSILOQTARG="--disable-silex"
else
export SILOQTDIR="$QT_INSTALL_DIR" #"${VISITDIR}/qt/${QT_VERSION}/${VISITARCH}"
WITHSILOQTARG="--with-Qt-dir=$SILOQTDIR --with-Qt-lib=QtGui"
WITHSILOQTARG='--with-Qt-dir=$SILOQTDIR --with-Qt-lib="QtGui -lQtCore"'
fi
if [[ "$DO_ZLIB" == "yes" ]] ; then
......@@ -185,7 +185,7 @@ function build_silo
CFLAGS=\"$CFLAGS $C_OPT_FLAGS\" CXXFLAGS=\"$CXXFLAGS $CXX_OPT_FLAGS\" \
$FORTRANARGS \
--prefix=\"$VISITDIR/silo/$SILO_VERSION/$VISITARCH\" \
\"$WITHHDF5ARG\" \"$WITHSZIPARG\" \"$WITHSILOQTARG\" \
$WITHHDF5ARG $WITHSZIPARG $WITHSILOQTARG \
--enable-install-lite-headers --without-readline $ZLIBARGS $SILO_EXTRA_OPTIONS"
# In order to ensure $FORTRANARGS is expanded to build the arguments to
......@@ -193,7 +193,7 @@ function build_silo
sh -c "./configure CXX=\"$CXX_COMPILER\" CC=\"$C_COMPILER\" \
CFLAGS=\"$CFLAGS $C_OPT_FLAGS\" CXXFLAGS=\"$CXXFLAGS $CXX_OPT_FLAGS\" \
$FORTRANARGS \
--prefix=$VISITDIR/silo/$SILO_VERSION/$VISITARCH \
--prefix=\"$VISITDIR/silo/$SILO_VERSION/$VISITARCH\" \
$WITHHDF5ARG $WITHSZIPARG $WITHSILOQTARG \
--enable-install-lite-headers --without-readline $ZLIBARGS $SILO_EXTRA_OPTIONS"
......
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