prefer modern VTK component names

Author: aumuell

CMakeLists.txt

@@ -367,7 +367,10 @@ if (NOT COVISE_BUILD_ONLY_FILE)
 endif()
 
 if (NOT COVISE_BUILD_ONLY_ODDLOT AND NOT COVISE_BUILD_ONLY_COVER)
-    covise_find_package(VTK COMPONENTS vtkIOLegacy vtkIOXML vtkFiltersCore vtkCommonCore vtkImagingCore vtkCommonDataModel vtkCommonExecutionModel NO_MODULE)
+    covise_find_package(VTK COMPONENTS IOLegacy IOXML FiltersCore CommonCore ImagingCore CommonDataModel CommonExecutionModel NO_MODULE)
+    if (NOT VTK_FOUND)
+        covise_find_package(VTK COMPONENTS vtkIOLegacy vtkIOXML vtkFiltersCore vtkCommonCore vtkImagingCore vtkCommonDataModel vtkCommonExecutionModel NO_MODULE)
+    endif()
 endif()
 
 if (APPLE)

cmake/FindCOVISE.cmake

@@ -162,9 +162,14 @@ macro(covise_find_component comp)
        set(complib coVtk)
        set(compvar VTK)
        covise_find_package(VTK
-           COMPONENTS vtkIOLegacy vtkFiltersCore vtkCommonCore vtkImagingCore vtkCommonDataModel vtkCommonExecutionModel
-           NO_MODULE
-           QUIET)
+           COMPONENTS IOLegacy FiltersCore CommonCore ImagingCore CommonDataModel CommonExecutionModel
+           NO_MODULE)
+       if (NOT VTK_FOUND)
+           covise_find_package(VTK
+               COMPONENTS vtkIOLegacy vtkFiltersCore vtkCommonCore vtkImagingCore vtkCommonDataModel vtkCommonExecutionModel
+               NO_MODULE
+               QUIET)
+       endif()
        if (VTK_FOUND)
           set(ADD_LIBS ${VTK_LIBRARIES})
        endif()