Merge branch 'DataExplorerCleanups' into 'master'

Data explorer cleanups

See merge request ogs/ogs!3023

Applications/DataExplorer/VtkVis/CMakeLists.txt

@@ -135,14 +135,10 @@ if(GEOTIFF_FOUND)
     target_link_libraries(VtkVis PUBLIC ${GEOTIFF_LIBRARIES})
 endif() # GEOTIFF_FOUND
 
-target_link_libraries(VtkVis
-                      PUBLIC BaseLib
-                             GeoLib
-                             MeshLib
-                             DataHolderLib
-                             QtBase
-                             vtkIOImage
-                      PRIVATE MathLib ApplicationsFileIO Qt5::Gui spdlog::spdlog)
+target_link_libraries(
+    VtkVis
+    PUBLIC BaseLib GeoLib MeshLib DataHolderLib QtBase
+    PRIVATE MathLib ApplicationsFileIO Qt5::Gui spdlog::spdlog)
 
 if(OGS_USE_NETCDF)
     target_link_libraries(VtkVis

Applications/DataExplorer/VtkVis/VtkGeoImageSource.cpp

@@ -97,7 +97,7 @@ vtkImageData* VtkGeoImageSource::getImageData()
 
 void VtkGeoImageSource::SimpleExecute(vtkImageData* input, vtkImageData* output)
 {
-    vtkDebugMacro(<< "Executing VtkGeoImageSource")
+    vtkDebugMacro(<< "Executing VtkGeoImageSource");
     void* inPtr = input->GetScalarPointer();
     void* outPtr = output->GetScalarPointer();
     switch(output->GetScalarType())

scripts/cmake/Find.cmake

@@ -62,10 +62,10 @@ find_package(Boost ${ogs.minimum_version.boost} REQUIRED)
 set(VTK_COMPONENTS vtkIOXML)
 if(OGS_BUILD_GUI)
     set(VTK_COMPONENTS ${VTK_COMPONENTS}
-        vtkIOImage vtkIOLegacy vtkIOExport
-        vtkIOExportOpenGL2 vtkInteractionStyle vtkInteractionWidgets
+        vtkIOLegacy vtkIOExport vtkImagingCore
+        vtkInteractionStyle vtkInteractionWidgets
         vtkGUISupportQt vtkRenderingOpenGL2 vtkRenderingContextOpenGL2
-        vtkFiltersTexture vtkRenderingCore vtkFiltersParallel
+        vtkFiltersTexture vtkRenderingAnnotation vtkRenderingCore vtkFiltersParallel
     )
 endif()
 if(OGS_USE_MPI)