Commit 911560b2 authored by miller86's avatar miller86

Merge 2.11RC->Trunk...

* A native MOAB (Mesh Object datABase) plugin was added thanks to Iulian R. Grindeanu and Vijay S. Mahadevan at ANL.

* Several HDF5-based plugins were missing some VisIt-specific file opening and closing logic to detect bad HDF5 actors.
  These were the ALS, AMR, PVLD, SXRIS and XGC plugins. In theory, users should see no difference in behavior.

* The Exodus plugin was enhanced to build against classic netCDF which does not require HDF5 or netCDF 4, which does
  require HDF5.

* New CMake variables for packages that may be built either for serial or for parallel were introduced.
  These new variables have _MPIPAR appended just after the package moniker (e.g. HDF5_MPIPAR_DIR). When it is necessary to
  distinguish between serial and parallel installations of a package, the _MPIPAR variables are used to reference a
  parallel-enabled package's installation whereas the non_MPIPAR variables reference a serial installation.
  Otherwise, only the non_MPIPAR variables are used. And, depending on the build
  circumstances, the non_MPIPAR variables may refer to either a serial or a parallel package installation.

*  Proliferant references to ${ZLIB_LIB} variable in database plugins .xml files was removed. Only those plugins that
   actually directly call zlib library functions need it.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@29075 18c085ea-50e0-402c-830e-de6fd14e8384
parent e853c957
......@@ -8,7 +8,6 @@
</LDFLAGS>
<LIBS>
${HDF5_LIB}
${ZLIB_LIB}
</LIBS>
<FilePatterns>
*.h5
......
......@@ -60,19 +60,19 @@ SET(INSTALLTARGETS IALSDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MALSDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MALSDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(MALSDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(MALSDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MALSDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(EALSDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EALSDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EALSDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EALSDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EALSDatabase_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(EALSDatabase_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EALSDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EALSDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EALSDatabase_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EALSDatabase_par)
ENDIF(VISIT_PARALLEL)
......
......@@ -11,7 +11,6 @@
</LDFLAGS>
<LIBS>
${HDF5_LIB}
${ZLIB_LIB}
</LIBS>
<Files components="M">
avtAMRFileFormat.C
......
......@@ -76,19 +76,19 @@ SET(INSTALLTARGETS IAMRDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MAMRDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MAMRDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(MAMRDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(MAMRDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MAMRDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(EAMRDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EAMRDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EAMRDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EAMRDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EAMRDatabase_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(EAMRDatabase_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EAMRDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EAMRDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EAMRDatabase_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EAMRDatabase_par)
ENDIF(VISIT_PARALLEL)
......
......@@ -11,7 +11,6 @@
</LDFLAGS>
<LIBS>
${HDF5_LIB}
${ZLIB_LIB}
</LIBS>
<Attribute name="" purpose="" persistent="true" keyframe="true" exportAPI="" exportInclude="">
</Attribute>
......
......@@ -62,19 +62,19 @@ SET(INSTALLTARGETS IBATLDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MBATLDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MBATLDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(MBATLDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(MBATLDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MBATLDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(EBATLDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EBATLDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EBATLDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EBATLDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EBATLDatabase_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(EBATLDatabase_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EBATLDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EBATLDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EBATLDatabase_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EBATLDatabase_par)
ENDIF(VISIT_PARALLEL)
......
......@@ -327,6 +327,7 @@ CHECK_THIRDPARTY_SATISIFED(UNIC HDF5)
CHECK_THIRDPARTY_SATISIFED(Velodyne HDF5)
CHECK_THIRDPARTY_SATISIFED(Vs HDF5)
CHECK_THIRDPARTY_SATISIFED(XGC HDF5)
CHECK_THIRDPARTY_SATISIFED(MOAB HDF5)
CHECK_THIRDPARTY_SATISIFED(MOAB MOAB HDF5)
......
......@@ -62,19 +62,19 @@ SET(INSTALLTARGETS ICarpetHDF5Database)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MCarpetHDF5Database ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MCarpetHDF5Database visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(MCarpetHDF5Database visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(MCarpetHDF5Database MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MCarpetHDF5Database)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(ECarpetHDF5Database_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(ECarpetHDF5Database_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(ECarpetHDF5Database_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(ECarpetHDF5Database_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} ECarpetHDF5Database_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(ECarpetHDF5Database_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(ECarpetHDF5Database_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(ECarpetHDF5Database_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(ECarpetHDF5Database_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} ECarpetHDF5Database_par)
ENDIF(VISIT_PARALLEL)
......
......@@ -8,7 +8,6 @@
</LDFLAGS>
<LIBS>
${HDF5_LIB}
${ZLIB_LIB}
</LIBS>
<FilePatterns>
*.h5
......
......@@ -62,19 +62,19 @@ SET(INSTALLTARGETS IChomboDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MChomboDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MChomboDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(MChomboDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(MChomboDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MChomboDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(EChomboDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EChomboDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EChomboDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EChomboDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EChomboDatabase_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(EChomboDatabase_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EChomboDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EChomboDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EChomboDatabase_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EChomboDatabase_par)
ENDIF(VISIT_PARALLEL)
......
......@@ -8,7 +8,6 @@
</LDFLAGS>
<LIBS>
${HDF5_LIB}
${ZLIB_LIB}
</LIBS>
<FilePatterns>
*.hdf5
......
......@@ -60,19 +60,19 @@ SET(INSTALLTARGETS ICosmosPPDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MCosmosPPDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MCosmosPPDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(MCosmosPPDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(MCosmosPPDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MCosmosPPDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(ECosmosPPDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(ECosmosPPDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(ECosmosPPDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(ECosmosPPDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} ECosmosPPDatabase_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(ECosmosPPDatabase_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(ECosmosPPDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(ECosmosPPDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(ECosmosPPDatabase_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} ECosmosPPDatabase_par)
ENDIF(VISIT_PARALLEL)
......
......@@ -12,6 +12,5 @@
</LDFLAGS>
<LIBS>
${HDF5_LIB}
${ZLIB_LIB}
</LIBS>
</Plugin>
......@@ -65,19 +65,19 @@ SET(INSTALLTARGETS IEnzoDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MEnzoDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MEnzoDatabase visitcommon avtdbatts avtdatabase_ser ${HDF4_LIB} ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(MEnzoDatabase visitcommon avtdbatts avtdatabase_ser ${HDF4_LIB} ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(MEnzoDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MEnzoDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(EEnzoDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EEnzoDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF4_LIB} ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EEnzoDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF4_LIB} ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EEnzoDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EEnzoDatabase_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(EEnzoDatabase_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EEnzoDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF4_LIB} ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EEnzoDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF4_LIB} ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EEnzoDatabase_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EEnzoDatabase_par)
ENDIF(VISIT_PARALLEL)
......
......@@ -15,6 +15,5 @@
<LIBS>
${HDF4_LIB}
${HDF5_LIB}
${ZLIB_LIB}
</LIBS>
</Plugin>
......@@ -62,19 +62,19 @@ SET(INSTALLTARGETS IFLASHDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MFLASHDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MFLASHDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(MFLASHDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(MFLASHDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MFLASHDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(EFLASHDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EFLASHDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EFLASHDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EFLASHDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EFLASHDatabase_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(EFLASHDatabase_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EFLASHDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EFLASHDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EFLASHDatabase_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EFLASHDatabase_par)
ENDIF(VISIT_PARALLEL)
......
......@@ -8,7 +8,6 @@
</LDFLAGS>
<LIBS>
${HDF5_LIB}
${ZLIB_LIB}
</LIBS>
<Attribute name="" purpose="" persistent="true" keyframe="true" exportAPI="" exportInclude="">
</Attribute>
......
......@@ -60,19 +60,19 @@ SET(INSTALLTARGETS IGTCDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MGTCDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MGTCDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(MGTCDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(MGTCDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MGTCDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(EGTCDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EGTCDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EGTCDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EGTCDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EGTCDatabase_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(EGTCDatabase_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EGTCDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EGTCDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EGTCDatabase_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EGTCDatabase_par)
ENDIF(VISIT_PARALLEL)
......
......@@ -8,7 +8,6 @@
</LDFLAGS>
<LIBS>
${HDF5_LIB}
${ZLIB_LIB}
</LIBS>
<FilePatterns>
*.h5
......
......@@ -62,19 +62,19 @@ SET(INSTALLTARGETS IH5NimrodDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MH5NimrodDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MH5NimrodDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(MH5NimrodDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(MH5NimrodDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MH5NimrodDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(EH5NimrodDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EH5NimrodDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EH5NimrodDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EH5NimrodDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EH5NimrodDatabase_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(EH5NimrodDatabase_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EH5NimrodDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EH5NimrodDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EH5NimrodDatabase_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EH5NimrodDatabase_par)
ENDIF(VISIT_PARALLEL)
......
......@@ -8,7 +8,6 @@
</LDFLAGS>
<LIBS>
${HDF5_LIB}
${ZLIB_LIB}
</LIBS>
<FilePatterns>
*.h5
......
......@@ -78,10 +78,6 @@ ${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
IF(UNIX AND NOT APPLE)
SET(RT rt)
ENDIF(UNIX AND NOT APPLE)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} ${FASTBIT_LIBRARY_DIR} ${H5PART_LIBRARY_DIR} )
ADD_LIBRARY(IH5PartDatabase ${LIBI_SOURCES})
......@@ -90,19 +86,19 @@ SET(INSTALLTARGETS IH5PartDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MH5PartDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MH5PartDatabase visitcommon avtdbatts avtdatabase_ser ${FASTBIT_LIB} ${H5PART_LIB} ${HDF5_LIB} ${ZLIB_LIB} ${RT} )
TARGET_LINK_LIBRARIES(MH5PartDatabase visitcommon avtdbatts avtdatabase_ser ${FASTBIT_LIB} ${H5PART_LIB} ${HDF5_LIB} ${RT} )
ADD_TARGET_DEFINITIONS(MH5PartDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MH5PartDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(EH5PartDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EH5PartDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${FASTBIT_LIB} ${H5PART_LIB} ${HDF5_LIB} ${ZLIB_LIB} ${RT} )
TARGET_LINK_LIBRARIES(EH5PartDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${FASTBIT_LIB} ${H5PART_LIB} ${HDF5_LIB} ${RT} )
ADD_TARGET_DEFINITIONS(EH5PartDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EH5PartDatabase_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(EH5PartDatabase_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EH5PartDatabase_par visitcommon avtdatabase_par avtpipeline_par ${FASTBIT_LIB} ${H5PART_LIB} ${HDF5_LIB} ${ZLIB_LIB} ${RT} )
TARGET_LINK_LIBRARIES(EH5PartDatabase_par visitcommon avtdatabase_par avtpipeline_par ${FASTBIT_LIB} ${H5PART_LIB} ${HDF5_LIB} ${RT} )
ADD_TARGET_DEFINITIONS(EH5PartDatabase_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EH5PartDatabase_par)
ENDIF(VISIT_PARALLEL)
......
......@@ -14,7 +14,6 @@
${FASTBIT_LIB}
${H5PART_LIB}
${HDF5_LIB}
${ZLIB_LIB}
${RT}
</LIBS>
<FilePatterns>
......
......@@ -60,19 +60,19 @@ SET(INSTALLTARGETS IM3DDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MM3DDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MM3DDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(MM3DDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(MM3DDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MM3DDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(EM3DDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EM3DDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EM3DDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EM3DDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EM3DDatabase_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(EM3DDatabase_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EM3DDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EM3DDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EM3DDatabase_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EM3DDatabase_par)
ENDIF(VISIT_PARALLEL)
......
......@@ -8,7 +8,6 @@
</LDFLAGS>
<LIBS>
${HDF5_LIB}
${ZLIB_LIB}
</LIBS>
<FilePatterns>
*.m3d
......
......@@ -64,19 +64,19 @@ SET(INSTALLTARGETS IM3DC1Database)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MM3DC1Database ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MM3DC1Database visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(MM3DC1Database visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(MM3DC1Database MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MM3DC1Database)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(EM3DC1Database_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EM3DC1Database_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EM3DC1Database_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EM3DC1Database_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EM3DC1Database_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(EM3DC1Database_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EM3DC1Database_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EM3DC1Database_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EM3DC1Database_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EM3DC1Database_par)
ENDIF(VISIT_PARALLEL)
......
......@@ -8,7 +8,6 @@
</LDFLAGS>
<LIBS>
${HDF5_LIB}
${ZLIB_LIB}
</LIBS>
<FilePatterns>
*.h5
......
......@@ -60,19 +60,19 @@ SET(INSTALLTARGETS IPFLOTRANDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MPFLOTRANDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MPFLOTRANDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(MPFLOTRANDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(MPFLOTRANDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MPFLOTRANDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(EPFLOTRANDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EPFLOTRANDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EPFLOTRANDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EPFLOTRANDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EPFLOTRANDatabase_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(EPFLOTRANDatabase_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EPFLOTRANDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EPFLOTRANDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EPFLOTRANDatabase_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EPFLOTRANDatabase_par)
ENDIF(VISIT_PARALLEL)
......
......@@ -8,7 +8,6 @@
</LDFLAGS>
<LIBS>
${HDF5_LIB}
${ZLIB_LIB}
</LIBS>
<FilePatterns>
*.h5
......
......@@ -70,19 +70,19 @@ SET(INSTALLTARGETS IPVLDDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MPVLDDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MPVLDDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(MPVLDDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(MPVLDDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MPVLDDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(EPVLDDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EPVLDDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EPVLDDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EPVLDDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EPVLDDatabase_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(EPVLDDatabase_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EPVLDDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EPVLDDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EPVLDDatabase_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EPVLDDatabase_par)
ENDIF(VISIT_PARALLEL)
......
......@@ -11,7 +11,6 @@
</LDFLAGS>
<LIBS>
${HDF5_LIB}
${ZLIB_LIB}
</LIBS>
<Files components="M">
statm.C
......
......@@ -62,19 +62,19 @@ SET(INSTALLTARGETS IPixieDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MPixieDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MPixieDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(MPixieDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(MPixieDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MPixieDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(EPixieDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EPixieDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EPixieDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EPixieDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EPixieDatabase_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(EPixieDatabase_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EPixieDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EPixieDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EPixieDatabase_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EPixieDatabase_par)
ENDIF(VISIT_PARALLEL)
......
......@@ -8,7 +8,6 @@
</LDFLAGS>
<LIBS>
${HDF5_LIB}
${ZLIB_LIB}
</LIBS>
<FilePatterns>
*.h5
......
......@@ -60,19 +60,19 @@ SET(INSTALLTARGETS ISAMRAIDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MSAMRAIDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MSAMRAIDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(MSAMRAIDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(MSAMRAIDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MSAMRAIDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(ESAMRAIDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(ESAMRAIDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(ESAMRAIDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(ESAMRAIDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} ESAMRAIDatabase_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(ESAMRAIDatabase_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(ESAMRAIDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(ESAMRAIDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(ESAMRAIDatabase_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} ESAMRAIDatabase_par)
ENDIF(VISIT_PARALLEL)
......
......@@ -11,6 +11,5 @@
</LDFLAGS>
<LIBS>
${HDF5_LIB}
${ZLIB_LIB}
</LIBS>
</Plugin>
......@@ -60,19 +60,19 @@ SET(INSTALLTARGETS ISXRISDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MSXRISDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MSXRISDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(MSXRISDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(MSXRISDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MSXRISDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(ESXRISDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(ESXRISDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(ESXRISDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(ESXRISDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} ESXRISDatabase_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(ESXRISDatabase_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(ESXRISDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(ESXRISDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(ESXRISDatabase_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} ESXRISDatabase_par)
ENDIF(VISIT_PARALLEL)
......
......@@ -8,7 +8,6 @@
</LDFLAGS>
<LIBS>
${HDF5_LIB}
${ZLIB_LIB}
</LIBS>
<FilePatterns>
*.h5
......
......@@ -60,19 +60,19 @@ SET(INSTALLTARGETS ITetradDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MTetradDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MTetradDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(MTetradDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(MTetradDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MTetradDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(ETetradDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(ETetradDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(ETetradDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(ETetradDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} ETetradDatabase_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(ETetradDatabase_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(ETetradDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(ETetradDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(ETetradDatabase_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} ETetradDatabase_par)
ENDIF(VISIT_PARALLEL)
......
......@@ -12,6 +12,5 @@
</LDFLAGS>
<LIBS>
${HDF5_LIB}
${ZLIB_LIB}
</LIBS>
</Plugin>
......@@ -60,19 +60,19 @@ SET(INSTALLTARGETS IUNICDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MUNICDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MUNICDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(MUNICDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(MUNICDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MUNICDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(EUNICDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EUNICDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EUNICDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EUNICDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EUNICDatabase_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(EUNICDatabase_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EUNICDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EUNICDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EUNICDatabase_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EUNICDatabase_par)
ENDIF(VISIT_PARALLEL)
......
......@@ -8,7 +8,6 @@
</LDFLAGS>
<LIBS>
${HDF5_LIB}
${ZLIB_LIB}
</LIBS>
<FilePatterns>
*.h5
......
......@@ -62,19 +62,19 @@ SET(INSTALLTARGETS IVelodyneDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MVelodyneDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MVelodyneDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(MVelodyneDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(MVelodyneDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MVelodyneDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(EVelodyneDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EVelodyneDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EVelodyneDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EVelodyneDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EVelodyneDatabase_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(EVelodyneDatabase_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EVelodyneDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EVelodyneDatabase_par visitcommon avtdatabase_par avtpipeline_par ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(EVelodyneDatabase_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EVelodyneDatabase_par)
ENDIF(VISIT_PARALLEL)
......
......@@ -20,6 +20,5 @@
</LDFLAGS>
<LIBS>
${HDF5_LIB}
${ZLIB_LIB}
</LIBS>
</Plugin>
......@@ -62,19 +62,19 @@ SET(INSTALLTARGETS IVisItXdmfDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MVisItXdmfDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MVisItXdmfDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(MVisItXdmfDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(MVisItXdmfDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MVisItXdmfDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(EVisItXdmfDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EVisItXdmfDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} ${ZLIB_LIB} )
TARGET_LINK_LIBRARIES(EVisItXdmfDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${HDF5_LIB} )