Merge pull request #39 from visit-dav/task/biagas/remove_eavl

Remove EAVL.
visit-dav · Jan 30, 2019 · 0f7e994 · 0f7e994
2 parents 184c993 + 6db4650
commit 0f7e994
Show file tree

Hide file tree

Showing 73 changed files with 147 additions and 291 deletions.
diff --git a/src/operators/AMRStitchCell/CMakeLists.txt b/src/operators/AMRStitchCell/CMakeLists.txt
@@ -9,7 +9,7 @@ AMRStitchCellCommonPluginInfo.C
 AMRStitchCellAttributes.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 AMRStitchCellPluginInfo.C
 )
 
@@ -86,14 +86,12 @@ ${VISIT_INCLUDE_DIR}/viewer/rpc
 ${VISIT_INCLUDE_DIR}/winutil
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 ${PYINCLUDES}
 ${VISIT_INCLUDE_DIR}/avt/Database/Ghost
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} )
 
 ADD_LIBRARY(IAMRStitchCellOperator ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IAMRStitchCellOperator visitcommon)

diff --git a/src/operators/AxisAlignedSlice4D/CMakeLists.txt b/src/operators/AxisAlignedSlice4D/CMakeLists.txt
@@ -9,7 +9,7 @@ AxisAlignedSlice4DCommonPluginInfo.C
 AxisAlignedSlice4DAttributes.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 AxisAlignedSlice4DPluginInfo.C
 )
 
@@ -84,13 +84,11 @@ ${VISIT_INCLUDE_DIR}/viewer/rpc
 ${VISIT_INCLUDE_DIR}/winutil
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 ${PYINCLUDES}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} )
 
 ADD_LIBRARY(IAxisAlignedSlice4DOperator ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IAxisAlignedSlice4DOperator visitcommon)

diff --git a/src/operators/BoundaryOp/CMakeLists.txt b/src/operators/BoundaryOp/CMakeLists.txt
@@ -9,7 +9,7 @@ BoundaryOpCommonPluginInfo.C
 BoundaryOpAttributes.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 BoundaryOpPluginInfo.C
 )
 
@@ -84,13 +84,11 @@ ${VISIT_INCLUDE_DIR}/viewer/rpc
 ${VISIT_INCLUDE_DIR}/winutil
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 ${PYINCLUDES}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} )
 
 ADD_LIBRARY(IBoundaryOpOperator ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IBoundaryOpOperator visitcommon)

diff --git a/src/operators/Box/CMakeLists.txt b/src/operators/Box/CMakeLists.txt
@@ -9,7 +9,7 @@ BoxCommonPluginInfo.C
 BoxAttributes.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 BoxPluginInfo.C
 )
 
@@ -84,13 +84,11 @@ ${VISIT_INCLUDE_DIR}/viewer/rpc
 ${VISIT_INCLUDE_DIR}/winutil
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 ${PYINCLUDES}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} )
 
 ADD_LIBRARY(IBoxOperator ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IBoxOperator visitcommon)

diff --git a/src/operators/CartographicProjection/CMakeLists.txt b/src/operators/CartographicProjection/CMakeLists.txt
@@ -9,7 +9,7 @@ CartographicProjectionCommonPluginInfo.C
 CartographicProjectionAttributes.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 CartographicProjectionPluginInfo.C
 )
 
@@ -84,13 +84,11 @@ ${VISIT_INCLUDE_DIR}/viewer/rpc
 ${VISIT_INCLUDE_DIR}/winutil
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 ${PYINCLUDES}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} )
 
 ADD_LIBRARY(ICartographicProjectionOperator ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(ICartographicProjectionOperator visitcommon)

diff --git a/src/operators/Clip/CMakeLists.txt b/src/operators/Clip/CMakeLists.txt
@@ -9,7 +9,7 @@ ClipCommonPluginInfo.C
 ClipAttributes.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 ClipPluginInfo.C
 )
 
@@ -84,13 +84,11 @@ ${VISIT_INCLUDE_DIR}/viewer/rpc
 ${VISIT_INCLUDE_DIR}/winutil
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 ${PYINCLUDES}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} )
 
 ADD_LIBRARY(IClipOperator ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IClipOperator visitcommon)

diff --git a/src/operators/Cone/CMakeLists.txt b/src/operators/Cone/CMakeLists.txt
@@ -9,7 +9,7 @@ ConeCommonPluginInfo.C
 ConeAttributes.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 ConePluginInfo.C
 )
 
@@ -84,13 +84,11 @@ ${VISIT_INCLUDE_DIR}/viewer/rpc
 ${VISIT_INCLUDE_DIR}/winutil
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 ${PYINCLUDES}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} )
 
 ADD_LIBRARY(IConeOperator ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IConeOperator visitcommon)

diff --git a/src/operators/ConnCompReduce/CMakeLists.txt b/src/operators/ConnCompReduce/CMakeLists.txt
@@ -9,7 +9,7 @@ ConnCompReduceCommonPluginInfo.C
 ConnCompReduceAttributes.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 ConnCompReducePluginInfo.C
 )
 
@@ -84,13 +84,11 @@ ${VISIT_INCLUDE_DIR}/viewer/rpc
 ${VISIT_INCLUDE_DIR}/winutil
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 ${PYINCLUDES}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} )
 
 ADD_LIBRARY(IConnCompReduceOperator ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IConnCompReduceOperator visitcommon)

diff --git a/src/operators/ConnectedComponents/CMakeLists.txt b/src/operators/ConnectedComponents/CMakeLists.txt
@@ -9,7 +9,7 @@ ConnectedComponentsCommonPluginInfo.C
 ConnectedComponentsAttributes.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 ConnectedComponentsPluginInfo.C
 )
 
@@ -84,13 +84,11 @@ ${VISIT_INCLUDE_DIR}/viewer/rpc
 ${VISIT_INCLUDE_DIR}/winutil
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 ${PYINCLUDES}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} )
 
 ADD_LIBRARY(IConnectedComponentsOperator ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IConnectedComponentsOperator visitcommon)

diff --git a/src/operators/Context/CMakeLists.txt b/src/operators/Context/CMakeLists.txt
@@ -9,7 +9,7 @@ ContextCommonPluginInfo.C
 ContextAttributes.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 ContextPluginInfo.C
 )
 
@@ -84,13 +84,11 @@ ${VISIT_INCLUDE_DIR}/viewer/rpc
 ${VISIT_INCLUDE_DIR}/winutil
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 ${PYINCLUDES}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} )
 
 ADD_LIBRARY(IContextOperator ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IContextOperator visitcommon)

diff --git a/src/operators/CoordSwap/CMakeLists.txt b/src/operators/CoordSwap/CMakeLists.txt
@@ -9,7 +9,7 @@ CoordSwapCommonPluginInfo.C
 CoordSwapAttributes.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 CoordSwapPluginInfo.C
 )
 
@@ -84,13 +84,11 @@ ${VISIT_INCLUDE_DIR}/viewer/rpc
 ${VISIT_INCLUDE_DIR}/winutil
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 ${PYINCLUDES}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} )
 
 ADD_LIBRARY(ICoordSwapOperator ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(ICoordSwapOperator visitcommon)

diff --git a/src/operators/CracksClipper/CMakeLists.txt b/src/operators/CracksClipper/CMakeLists.txt
@@ -9,7 +9,7 @@ CracksClipperCommonPluginInfo.C
 CracksClipperAttributes.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 CracksClipperPluginInfo.C
 )
 
@@ -93,13 +93,11 @@ ${VISIT_INCLUDE_DIR}/viewer/rpc
 ${VISIT_INCLUDE_DIR}/winutil
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 ${PYINCLUDES}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} )
 
 ADD_LIBRARY(ICracksClipperOperator ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(ICracksClipperOperator visitcommon)

diff --git a/src/operators/CreateBonds/CMakeLists.txt b/src/operators/CreateBonds/CMakeLists.txt
@@ -9,7 +9,7 @@ CreateBondsCommonPluginInfo.C
 CreateBondsAttributes.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 CreateBondsPluginInfo.C
 )
 
@@ -84,13 +84,11 @@ ${VISIT_INCLUDE_DIR}/viewer/rpc
 ${VISIT_INCLUDE_DIR}/winutil
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 ${PYINCLUDES}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} )
 
 ADD_LIBRARY(ICreateBondsOperator ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(ICreateBondsOperator visitcommon)

diff --git a/src/operators/Cylinder/CMakeLists.txt b/src/operators/Cylinder/CMakeLists.txt
@@ -9,7 +9,7 @@ CylinderCommonPluginInfo.C
 CylinderAttributes.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 CylinderPluginInfo.C
 )
 
@@ -84,13 +84,11 @@ ${VISIT_INCLUDE_DIR}/viewer/rpc
 ${VISIT_INCLUDE_DIR}/winutil
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 ${PYINCLUDES}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} )
 
 ADD_LIBRARY(ICylinderOperator ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(ICylinderOperator visitcommon)

diff --git a/src/operators/DataBinning/CMakeLists.txt b/src/operators/DataBinning/CMakeLists.txt
@@ -9,7 +9,7 @@ DataBinningCommonPluginInfo.C
 DataBinningAttributes.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 DataBinningPluginInfo.C
 )
 
@@ -84,14 +84,12 @@ ${VISIT_INCLUDE_DIR}/viewer/rpc
 ${VISIT_INCLUDE_DIR}/winutil
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 ${PYINCLUDES}
 ${VISIT_INCLUDE_DIR}/avt/DataBinning
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} )
 
 ADD_LIBRARY(IDataBinningOperator ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IDataBinningOperator visitcommon)

diff --git a/src/operators/Decimate/CMakeLists.txt b/src/operators/Decimate/CMakeLists.txt
@@ -9,7 +9,7 @@ DecimateCommonPluginInfo.C
 DecimateAttributes.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 DecimatePluginInfo.C
 )
 
@@ -84,13 +84,11 @@ ${VISIT_INCLUDE_DIR}/viewer/rpc
 ${VISIT_INCLUDE_DIR}/winutil
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 ${PYINCLUDES}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} )
 
 ADD_LIBRARY(IDecimateOperator ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IDecimateOperator visitcommon)