Commit 1d35f7e7 authored by Dave Demarle's avatar Dave Demarle
Browse files

COMP: remove more windows build warnings and tell paraview windows build where to find xml2 library

parent 27186f22
......@@ -10,6 +10,7 @@ ELSE (PARAVIEW_USE_MPI)
ENDIF (PARAVIEW_USE_MPI)
SET(XDMF_BUILD_VTK 1)
SET(LIBXML2_LIBRARY vtklibxml2)
SET(HDF5_LIBRARY ${PARAVIEW_HDF5_LIBRARIES})
IF(VTK_USE_SYSTEM_EXPAT)
......
......@@ -315,6 +315,10 @@ ELSE(BUILD_SHARED_LIBS)
ADD_LIBRARY(Xdmf STATIC ${XdmfSources})
ENDIF(BUILD_SHARED_LIBS)
IF(XDMF_BUILD_MPI)
TARGET_LINK_LIBRARIES(Xdmf ${MPI_LIBRARY_PATH})
ENDIF(XDMF_BUILD_MPI)
IF(XDMF_HAS_NDGM)
TARGET_LINK_LIBRARIES(Xdmf ${NDGM_LIBRARY} ${NDGM_SERVER_LIBRARY} ${HDF5_LIBRARY} ${XDMF_MPI_LIBRARIES} ${LIBXML2_LIBRARY} ${XDMF_EXPAT_LIBRARIES} ${XDMF_ZLIB_LIBRARIES})
ELSE(XDMF_HAS_NDGM)
......
......@@ -389,7 +389,7 @@ H5FD_dsm_open(const char *name, unsigned flags/*unused*/, hid_t fapl_id,
H5FD_dsm_t *file=NULL;
H5FD_dsm_fapl_t *fa=NULL;
XdmfInt32 status;
XdmfInt64 addr;
//XdmfInt64 addr;
/* Check arguments */
if (0==maxaddr || HADDR_UNDEF==maxaddr) return NULL;
......
......@@ -70,13 +70,13 @@ XdmfValues::Inherit(XdmfDataItem *DataItem) {
// Override this
XdmfArray *
XdmfValues::Read(XdmfArray */*anArray*/){
XdmfValues::Read(XdmfArray *){
return(NULL);
}
// Override this
XdmfInt32
XdmfValues::Write(XdmfArray */*anArray*/, XdmfConstString /*HeavyDataSetName*/){
XdmfValues::Write(XdmfArray *, XdmfConstString ){
return(XDMF_FAIL);
}
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