[pull] master from valette:master

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [ v9.0.3, v9.1.0, v9.2.6 ]
+        version: [ v9.0, v9.1, v9.2, v9.3, v9.4, latest ]
     container: kitware/vtk-for-ci:${{ matrix.version }}
 
     steps:
@@ -41,4 +41,6 @@ jobs:
 
     - name: Test
       working-directory: ${{github.workspace}}/build
-      run: bash ../source/test.sh
+      run: |
+        export LD_LIBRARY_PATH=/opt/vtk/install/lib/:/opt/catalyst/install/lib/:$LD_LIBRARY_PATH
+        bash ../source/test.sh

CMakeLists.txt

@@ -1,13 +1,8 @@
+cmake_minimum_required(VERSION 3.11.0)
 project(ACVD)
 
-cmake_minimum_required(VERSION 3.5.0)
-
-if( POLICY CMP0042 )
-  cmake_policy( SET CMP0042 NEW )
-endif()
-
 # version
-set( ACVD_MAJOR_VERSION 1 )
+set( ACVD_MAJOR_VERSION 4 )
 set( ACVD_MINOR_VERSION 0 )
 set( ACVD_PATCH_VERSION 0 )
 set( ACVD_VERSION ${ACVD_MAJOR_VERSION}.${ACVD_MINOR_VERSION}.${ACVD_PATCH_VERSION} )
@@ -31,12 +26,25 @@ foreach(p LIB BIN INCLUDE CMAKE)
 endforeach()
 
 # find_package
-find_package(VTK REQUIRED NO_MODULE)
-if(VTK_USE_FILE)
-  include(${VTK_USE_FILE})
-else()
-  include_directories(${VTK_INCLUDE_DIRS})
-endif()
+find_package(VTK
+    REQUIRED
+    COMPONENTS
+    CommonSystem
+    FiltersModeling
+    ImagingGeneral
+    InteractionStyle
+    IOXML
+    IOExport
+    IOGeometry
+    IOImport
+    IOLegacy
+    IOMINC
+    IOPLY
+    RenderingLabel
+    RenderingOpenGL2
+)
+
+include_directories(${VTK_INCLUDE_DIRS})
 
 option(BUILD_SHARED_LIBS "Build vtkSurface with shared libraries." ON)
 option(BUILD_DOCUMENTATION "Build the html documentation with doxygen." OFF)