Commit 95ce501e authored by bonnell's avatar bonnell

Put -I cxx flags in include-directories instead of defines, clean up white-space creep

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@28113 18c085ea-50e0-402c-830e-de6fd14e8384
parent bc08237d
......@@ -19,6 +19,7 @@
avtSpecFEMFileFormat.C
avtADIOSSchemaFileFormat.C
avtLAMMPSFileFormat.C
avtPIConGPUFileFormat.C
ADIOSFileObject.C
</Files>
<LIBS components="M">
......@@ -31,6 +32,7 @@
avtSpecFEMFileFormat.C
avtADIOSSchemaFileFormat.C
avtLAMMPSFileFormat.C
avtPIConGPUFileFormat.C
ADIOSFileObject.C
</Files>
<LIBS components="ESer">
......
......@@ -61,12 +61,11 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${ADIOS_LIBRARY_DIR} )
ADD_LIBRARY(IADIOSDatabase ${LIBI_SOURCES})
......@@ -74,7 +73,7 @@ TARGET_LINK_LIBRARIES(IADIOSDatabase visitcommon)
SET(INSTALLTARGETS IADIOSDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MADIOSDatabase ${LIBM_SOURCES} )
ADD_LIBRARY(MADIOSDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MADIOSDatabase visitcommon avtdbatts avtdatabase_ser vtkFiltersHybrid -ladiosread_nompi )
ADD_TARGET_DEFINITIONS(MADIOSDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MADIOSDatabase)
......
......@@ -47,12 +47,11 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
ADD_LIBRARY(IALSDatabase ${LIBI_SOURCES})
......@@ -60,7 +59,7 @@ TARGET_LINK_LIBRARIES(IALSDatabase visitcommon)
SET(INSTALLTARGETS IALSDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MALSDatabase ${LIBM_SOURCES} )
ADD_LIBRARY(MALSDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MALSDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} ${ZLIB_LIB} )
ADD_TARGET_DEFINITIONS(MALSDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MALSDatabase)
......
......@@ -63,12 +63,11 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
ADD_LIBRARY(IAMRDatabase ${LIBI_SOURCES})
......@@ -76,7 +75,7 @@ TARGET_LINK_LIBRARIES(IAMRDatabase visitcommon)
SET(INSTALLTARGETS IAMRDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MAMRDatabase ${LIBM_SOURCES} )
ADD_LIBRARY(MAMRDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MAMRDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} ${ZLIB_LIB} )
ADD_TARGET_DEFINITIONS(MAMRDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MAMRDatabase)
......
......@@ -46,12 +46,11 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
ADD_LIBRARY(IAMRTestDatabase ${LIBI_SOURCES})
......@@ -59,7 +58,7 @@ TARGET_LINK_LIBRARIES(IAMRTestDatabase visitcommon)
SET(INSTALLTARGETS IAMRTestDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MAMRTestDatabase ${LIBM_SOURCES} )
ADD_LIBRARY(MAMRTestDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MAMRTestDatabase visitcommon avtdbatts avtdatabase_ser )
ADD_TARGET_DEFINITIONS(MAMRTestDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MAMRTestDatabase)
......
......@@ -48,12 +48,11 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
ADD_LIBRARY(IANALYZEDatabase ${LIBI_SOURCES})
......@@ -61,7 +60,7 @@ TARGET_LINK_LIBRARIES(IANALYZEDatabase visitcommon)
SET(INSTALLTARGETS IANALYZEDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MANALYZEDatabase ${LIBM_SOURCES} )
ADD_LIBRARY(MANALYZEDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MANALYZEDatabase visitcommon avtdbatts avtdatabase_ser )
ADD_TARGET_DEFINITIONS(MANALYZEDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MANALYZEDatabase)
......
......@@ -46,12 +46,11 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
ADD_LIBRARY(IANSYSDatabase ${LIBI_SOURCES})
......@@ -59,7 +58,7 @@ TARGET_LINK_LIBRARIES(IANSYSDatabase visitcommon)
SET(INSTALLTARGETS IANSYSDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MANSYSDatabase ${LIBM_SOURCES} )
ADD_LIBRARY(MANSYSDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MANSYSDatabase visitcommon avtdbatts avtdatabase_ser )
ADD_TARGET_DEFINITIONS(MANSYSDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MANSYSDatabase)
......
......@@ -46,12 +46,11 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
ADD_LIBRARY(IAUXFileDatabase ${LIBI_SOURCES})
......@@ -59,7 +58,7 @@ TARGET_LINK_LIBRARIES(IAUXFileDatabase visitcommon)
SET(INSTALLTARGETS IAUXFileDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MAUXFileDatabase ${LIBM_SOURCES} )
ADD_LIBRARY(MAUXFileDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MAUXFileDatabase visitcommon avtdbatts avtdatabase_ser )
ADD_TARGET_DEFINITIONS(MAUXFileDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MAUXFileDatabase)
......
......@@ -53,12 +53,11 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${ADVIO_LIBRARY_DIR} )
ADD_LIBRARY(IAdventureDatabase ${LIBI_SOURCES})
......@@ -66,7 +65,7 @@ TARGET_LINK_LIBRARIES(IAdventureDatabase visitcommon)
SET(INSTALLTARGETS IAdventureDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MAdventureDatabase ${LIBM_SOURCES} )
ADD_LIBRARY(MAdventureDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MAdventureDatabase visitcommon avtdbatts avtdatabase_ser ${ADVIO_LIB} visit_verdict )
ADD_TARGET_DEFINITIONS(MAdventureDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MAdventureDatabase)
......
......@@ -46,12 +46,11 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
ADD_LIBRARY(IAugDecompDatabase ${LIBI_SOURCES})
......@@ -59,7 +58,7 @@ TARGET_LINK_LIBRARIES(IAugDecompDatabase visitcommon)
SET(INSTALLTARGETS IAugDecompDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MAugDecompDatabase ${LIBM_SOURCES} )
ADD_LIBRARY(MAugDecompDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MAugDecompDatabase visitcommon avtdbatts avtdatabase_ser )
ADD_TARGET_DEFINITIONS(MAugDecompDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MAugDecompDatabase)
......
......@@ -49,12 +49,11 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
ADD_LIBRARY(IBATLDatabase ${LIBI_SOURCES})
......@@ -62,7 +61,7 @@ TARGET_LINK_LIBRARIES(IBATLDatabase visitcommon)
SET(INSTALLTARGETS IBATLDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MBATLDatabase ${LIBM_SOURCES} )
ADD_LIBRARY(MBATLDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MBATLDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} ${ZLIB_LIB} )
ADD_TARGET_DEFINITIONS(MBATLDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MBATLDatabase)
......
......@@ -47,12 +47,11 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
ADD_LIBRARY(IBOVDatabase ${LIBI_SOURCES})
......@@ -60,7 +59,7 @@ TARGET_LINK_LIBRARIES(IBOVDatabase visitcommon)
SET(INSTALLTARGETS IBOVDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MBOVDatabase ${LIBM_SOURCES} )
ADD_LIBRARY(MBOVDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MBOVDatabase visitcommon avtdbatts avtdatabase_ser ${vtkzlib_LIBRARIES} )
ADD_TARGET_DEFINITIONS(MBOVDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MBOVDatabase)
......
......@@ -49,12 +49,13 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
ADD_DEFINITIONS(-DBL_SPACEDIM=2)
IF(WIN32)
ADD_DEFINITIONS(-DBL_FORT_USE_UPPERCASE)
ENDIF(WIN32)
......@@ -66,7 +67,7 @@ TARGET_LINK_LIBRARIES(IBoxlib2DDatabase visitcommon)
SET(INSTALLTARGETS IBoxlib2DDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MBoxlib2DDatabase ${LIBM_SOURCES} )
ADD_LIBRARY(MBoxlib2DDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MBoxlib2DDatabase visitcommon avtdbatts avtdatabase_ser ${BOXLIB_2D_LIB} )
ADD_TARGET_DEFINITIONS(MBoxlib2DDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MBoxlib2DDatabase)
......
......@@ -49,12 +49,13 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
ADD_DEFINITIONS(-DBL_SPACEDIM=3)
IF(WIN32)
ADD_DEFINITIONS(-DBL_FORT_USE_UPPERCASE)
ENDIF(WIN32)
......@@ -66,7 +67,7 @@ TARGET_LINK_LIBRARIES(IBoxlib3DDatabase visitcommon)
SET(INSTALLTARGETS IBoxlib3DDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MBoxlib3DDatabase ${LIBM_SOURCES} )
ADD_LIBRARY(MBoxlib3DDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MBoxlib3DDatabase visitcommon avtdbatts avtdatabase_ser ${BOXLIB_3D_LIB} )
ADD_TARGET_DEFINITIONS(MBoxlib3DDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MBoxlib3DDatabase)
......
......@@ -47,12 +47,11 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${CCMIO_LIBRARY_DIR} )
ADD_LIBRARY(ICCMDatabase ${LIBI_SOURCES})
......@@ -60,7 +59,7 @@ TARGET_LINK_LIBRARIES(ICCMDatabase visitcommon)
SET(INSTALLTARGETS ICCMDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MCCMDatabase ${LIBM_SOURCES} )
ADD_LIBRARY(MCCMDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MCCMDatabase visitcommon avtdbatts avtdatabase_ser ${CCMIO_LIB} )
ADD_TARGET_DEFINITIONS(MCCMDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MCCMDatabase)
......
......@@ -50,12 +50,11 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
ADD_LIBRARY(ICEAucdDatabase ${LIBI_SOURCES})
......@@ -63,7 +62,7 @@ TARGET_LINK_LIBRARIES(ICEAucdDatabase visitcommon)
SET(INSTALLTARGETS ICEAucdDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MCEAucdDatabase ${LIBM_SOURCES} )
ADD_LIBRARY(MCEAucdDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MCEAucdDatabase visitcommon avtdbatts avtdatabase_ser )
ADD_TARGET_DEFINITIONS(MCEAucdDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MCEAucdDatabase)
......
......@@ -47,9 +47,9 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
......@@ -63,7 +63,7 @@ TARGET_LINK_LIBRARIES(ICGNSDatabase visitcommon)
SET(INSTALLTARGETS ICGNSDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MCGNSDatabase ${LIBM_SOURCES} )
ADD_LIBRARY(MCGNSDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MCGNSDatabase visitcommon avtdbatts avtdatabase_ser ${CGNS_LIB} )
ADD_TARGET_DEFINITIONS(MCGNSDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MCGNSDatabase)
......
......@@ -46,12 +46,11 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
ADD_LIBRARY(ICMATDatabase ${LIBI_SOURCES})
......@@ -59,7 +58,7 @@ TARGET_LINK_LIBRARIES(ICMATDatabase visitcommon)
SET(INSTALLTARGETS ICMATDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MCMATDatabase ${LIBM_SOURCES} )
ADD_LIBRARY(MCMATDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MCMATDatabase visitcommon avtdbatts avtdatabase_ser )
ADD_TARGET_DEFINITIONS(MCMATDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MCMATDatabase)
......
......@@ -46,12 +46,11 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
ADD_LIBRARY(ICTRLDatabase ${LIBI_SOURCES})
......@@ -59,7 +58,7 @@ TARGET_LINK_LIBRARIES(ICTRLDatabase visitcommon)
SET(INSTALLTARGETS ICTRLDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MCTRLDatabase ${LIBM_SOURCES} )
ADD_LIBRARY(MCTRLDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MCTRLDatabase visitcommon avtdbatts avtdatabase_ser )
ADD_TARGET_DEFINITIONS(MCTRLDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MCTRLDatabase)
......
......@@ -47,12 +47,11 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${PDB_LIBRARY_DIR} )
ADD_LIBRARY(ICaleDatabase ${LIBI_SOURCES})
......@@ -60,7 +59,7 @@ TARGET_LINK_LIBRARIES(ICaleDatabase visitcommon)
SET(INSTALLTARGETS ICaleDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MCaleDatabase ${LIBM_SOURCES} )
ADD_LIBRARY(MCaleDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MCaleDatabase visitcommon avtdbatts avtdatabase_ser ${PDB_LIB} )
ADD_TARGET_DEFINITIONS(MCaleDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MCaleDatabase)
......
......@@ -47,12 +47,11 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
ADD_LIBRARY(ICaleHDF5Database ${LIBI_SOURCES})
......@@ -60,7 +59,7 @@ TARGET_LINK_LIBRARIES(ICaleHDF5Database visitcommon)
SET(INSTALLTARGETS ICaleHDF5Database)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MCaleHDF5Database ${LIBM_SOURCES} )
ADD_LIBRARY(MCaleHDF5Database ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MCaleHDF5Database visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} )
ADD_TARGET_DEFINITIONS(MCaleHDF5Database MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MCaleHDF5Database)
......
......@@ -49,12 +49,11 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
ADD_LIBRARY(ICarpetHDF5Database ${LIBI_SOURCES})
......@@ -62,7 +61,7 @@ TARGET_LINK_LIBRARIES(ICarpetHDF5Database visitcommon)
SET(INSTALLTARGETS ICarpetHDF5Database)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MCarpetHDF5Database ${LIBM_SOURCES} )
ADD_LIBRARY(MCarpetHDF5Database ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MCarpetHDF5Database visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} ${ZLIB_LIB} )
ADD_TARGET_DEFINITIONS(MCarpetHDF5Database MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MCarpetHDF5Database)
......
......@@ -49,12 +49,11 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
ADD_LIBRARY(IChomboDatabase ${LIBI_SOURCES})
......@@ -62,7 +61,7 @@ TARGET_LINK_LIBRARIES(IChomboDatabase visitcommon)
SET(INSTALLTARGETS IChomboDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MChomboDatabase ${LIBM_SOURCES} )
ADD_LIBRARY(MChomboDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MChomboDatabase visitcommon avtdbatts avtdatabase_ser ${HDF5_LIB} ${ZLIB_LIB} )
ADD_TARGET_DEFINITIONS(MChomboDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MChomboDatabase)
......
......@@ -46,12 +46,11 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
ADD_LIBRARY(IClawDatabase ${LIBI_SOURCES})
......@@ -59,7 +58,7 @@ TARGET_LINK_LIBRARIES(IClawDatabase visitcommon)
SET(INSTALLTARGETS IClawDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MClawDatabase ${LIBM_SOURCES} )
ADD_LIBRARY(MClawDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MClawDatabase visitcommon avtdbatts avtdatabase_ser )
ADD_TARGET_DEFINITIONS(MClawDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MClawDatabase)
......
......@@ -47,9 +47,9 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
......@@ -63,7 +63,7 @@ TARGET_LINK_LIBRARIES(ICosmosDatabase visitcommon)
SET(INSTALLTARGETS ICosmosDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MCosmosDatabase ${LIBM_SOURCES} )
ADD_LIBRARY(MCosmosDatabase ${LIBM_SOURCES})
TARGET_LINK_LIBRARIES(MCosmosDatabase visitcommon avtdbatts avtdatabase_ser ${HDF4_LIB} )
ADD_TARGET_DEFINITIONS(MCosmosDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MCosmosDatabase)
......
......@@ -47,12 +47,11 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EAVL_INCLUDE_DIR}
${VTKM_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
ADD_LIBRARY(ICosmosPPDatabase ${LIBI_SOURCES})
......@@ -60,7 +59,7 @@ TARGET_LINK_LIBRARIES(ICosmosPPDatabase visitcommon)
SET(INSTALLTARGETS ICosmosPPDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MCosmosPPDatabase ${LIBM_SOURCES} )
ADD_LIBRARY(MCosmosPPDatabase ${LIBM_SOURCES})