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

Remove EAVL support.
visit-dav · Jan 30, 2019 · ff2ed7f · ff2ed7f
2 parents 9f6e833 + 508c1c0
commit ff2ed7f
Show file tree

Hide file tree

Showing 54 changed files with 106 additions and 686 deletions.
diff --git a/src/CMake/FindEAVL.cmake b/src/CMake/FindEAVL.cmake
diff --git a/src/CMake/PluginVsInstall.cmake.in b/src/CMake/PluginVsInstall.cmake.in
@@ -202,10 +202,6 @@ set(OPENGL_LIBRARIES    @OPENGL_LIBRARIES@)
 # Set up the tessellation library
 set(TESSELLATION_LIBRARY @TESSELLATION_LIBRARY@)
 
-# EAVL
-set(EAVL_INCLUDE_DIR @EAVL_INCLUDE_DIR@)
-set(EAVL_LIBRARY_DIR @EAVL_LIBRARY_DIR@)
-
 # Set up BOOST
 set(BOOST_INCLUDE_DIR ${VISIT_INCLUDE_DIR}/boost/include/boost)
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -854,7 +854,6 @@ VISIT_3RDPARTY_DEP(CGNS_LIBDEP   "CGNS library dependencies")
 VISIT_3RDPARTY_VAR(CONDUIT_DIR   "Path containing the Conduit library's include and lib")
 VISIT_3RDPARTY_VAR(CONDUIT_LIBDEP "Conduit library dependencies")
 VISIT_3RDPARTY_VAR(DAMARIS_DIR   "Path containing the Damaris library's include and lib")
-VISIT_3RDPARTY_VAR(EAVL_DIR      "Path containing the eavl library's include and lib")
 VISIT_3RDPARTY_VAR(FASTBIT_DIR   "Path containing the FastBit library's include and lib")
 VISIT_3RDPARTY_VAR(FASTQUERY_DIR   "Path containing the FastQuery library's include and lib")
 VISIT_3RDPARTY_VAR(GDAL_DIR      "Path containing the GDAL library's include and lib")
@@ -1399,9 +1398,6 @@ IF(NOT VISIT_BUILD_MINIMAL_PLUGINS OR VISIT_SELECTED_DATABASE_PLUGINS)
     # Configure Conduit support.
     INCLUDE(${VISIT_SOURCE_DIR}/CMake/FindConduit.cmake)
 
-    # Configure eavl support.
-    INCLUDE(${VISIT_SOURCE_DIR}/CMake/FindEAVL.cmake)
-
     # Configure FastBit support.
     INCLUDE(${VISIT_SOURCE_DIR}/CMake/FindFastBit.cmake)
 

diff --git a/src/avt/DBAtts/MetaData/avtTypes.C b/src/avt/DBAtts/MetaData/avtTypes.C
@@ -208,6 +208,9 @@ avtPrecisionTypeToString(avtPrecisionType v)
 //    Eric Brugger, Thu Dec 10 11:14:07 PST 2015
 //    I added support for VTKm.
 //
+//    Kathleen Biagas, Thu Jan 10 10:02:14 PST 2019
+//    Removed EAVL support.
+//
 // ****************************************************************************
 
 std::string
@@ -217,8 +220,6 @@ avtBackendTypeToString(avtBackendType v)
     {
       case AVT_BACKEND_VTK:
         return "VTK";
-      case AVT_BACKEND_EAVL:
-        return "EAVL";
       case AVT_BACKEND_VTKM:
         return "VTKm";
       default:

diff --git a/src/avt/DBAtts/MetaData/avtTypes.h b/src/avt/DBAtts/MetaData/avtTypes.h
@@ -143,8 +143,7 @@ enum avtPrecisionType
 enum avtBackendType
 {
     AVT_BACKEND_VTK     = 0,
-    AVT_BACKEND_EAVL,  /* 1 */
-    AVT_BACKEND_VTKM   /* 2 */
+    AVT_BACKEND_VTKM   /* 1 */
 };
 
 enum SetState

diff --git a/src/avt/DataBinning/CMakeLists.txt b/src/avt/DataBinning/CMakeLists.txt
@@ -75,7 +75,7 @@ ${VTK_INCLUDE_DIRS}
 )
 
 # Add link directories
-LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${EAVL_LIBRARY_DIR} )
+LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY})
 
 #********************************* SERIAL ************************************
 ADD_LIBRARY(avtdbin_ser ${AVTDBIN_SOURCES})

diff --git a/src/avt/Database/CMakeLists.txt b/src/avt/Database/CMakeLists.txt
@@ -115,7 +115,7 @@ ${VTK_INCLUDE_DIRS}
 )
 
 # Add link directories
-LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${EAVL_LIBRARY_DIR} )
+LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY})
 
 # Unless we're doing a VISIT_DBIO_ONLY build then we need avtmir
 IF(NOT VISIT_DBIO_ONLY)

diff --git a/src/avt/Expressions/CMakeLists.txt b/src/avt/Expressions/CMakeLists.txt
@@ -383,7 +383,7 @@ ENDIF(VISIT_PYTHON_FILTERS)
 
 
 # Add link directories
-LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${EAVL_LIBRARY_DIR} )
+LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY})
 
 IF(VISIT_PYTHON_FILTERS)
     LINK_DIRECTORIES(${PYTHON_LIBRARY_DIRS})

diff --git a/src/avt/FileWriter/CMakeLists.txt b/src/avt/FileWriter/CMakeLists.txt
@@ -63,7 +63,7 @@ ${VTK_INCLUDE_DIRS}
 )
 
 # Add link directories
-LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${EAVL_LIBRARY_DIR} )
+LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY})
 
 #********************************* SERIAL ************************************
 ADD_LIBRARY(avtwriter_ser ${AVTWRITER_SOURCES})

diff --git a/src/avt/Filters/CMakeLists.txt b/src/avt/Filters/CMakeLists.txt
@@ -193,19 +193,18 @@ ${VISIT_SOURCE_DIR}/avt/VisWindow/Proxies
 ${VISIT_SOURCE_DIR}/avt/VisWindow/Tools
 ${VISIT_SOURCE_DIR}/avt/VisWindow/VisWindow
 ${VISIT_SOURCE_DIR}/engine/main
-${EAVL_INCLUDE_DIR}
 ${VTKh_INCLUDE_DIRS}
 ${VTKM_DIR}/include/vtkm-1.2
 ${VTKM_DIR}/include/vtkm-1.2/vtkm/thirdparty/taotuple
 ${VTK_INCLUDE_DIRS}
 )
 
 # Add link directories
-LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${EAVL_LIBRARY_DIR} )
+LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY})
 
 #********************************* SERIAL ************************************
 ADD_LIBRARY(avtfilters_ser ${AVTFILTERS_SOURCES})
-TARGET_LINK_LIBRARIES(avtfilters_ser visitcommon lightweight_visit_vtk visit_vtk avtmath avtview avtpipeline_ser avtdatabase_ser avtdbatts ${EAVL_LIB} vtkFiltersModeling)
+TARGET_LINK_LIBRARIES(avtfilters_ser visitcommon lightweight_visit_vtk visit_vtk avtmath avtview avtpipeline_ser avtdatabase_ser avtdbatts vtkFiltersModeling)
 IF(VISIT_OSPRAY) 
     TARGET_LINK_LIBRARIES(avtfilters_ser ${OSPRAY_LIBRARIES})
     IF(ICET_FOUND)
@@ -217,7 +216,7 @@ VISIT_INSTALL_TARGETS(avtfilters_ser)
 #********************************* PARALLEL **********************************
 IF(VISIT_PARALLEL)
     ADD_PARALLEL_LIBRARY(avtfilters_par ${AVTFILTERS_SOURCES})
-    TARGET_LINK_LIBRARIES(avtfilters_par visitcommon lightweight_visit_vtk visit_vtk avtmath avtview avtpipeline_par avtdatabase_par avtdbatts ${EAVL_LIB} vtkFiltersModeling)
+    TARGET_LINK_LIBRARIES(avtfilters_par visitcommon lightweight_visit_vtk visit_vtk avtmath avtview avtpipeline_par avtdatabase_par avtdbatts vtkFiltersModeling)
     IF(VISIT_OSPRAY) 
         TARGET_LINK_LIBRARIES(avtfilters_par ${OSPRAY_LIBRARIES})
         IF(ICET_FOUND)