Merge pull request #2 from LIHPC-Computational-Geometry/vtk9-dep-fix

Version 5.4.2. Fix cmake dependencies for VTK 9.
LIHPC-Computational-Geometry · Apr 16, 2024 · 7b8cc85 · 7b8cc85
2 parents 30151a7 + 29660c2
commit 7b8cc85
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/cmake/version.cmake b/cmake/version.cmake
@@ -4,7 +4,7 @@
 
 set (VTK_CONTRIB_MAJOR_VERSION "5")
 set (VTK_CONTRIB_MINOR_VERSION "4")
-set (VTK_CONTRIB_RELEASE_VERSION "1")
+set (VTK_CONTRIB_RELEASE_VERSION "2")
 set (VTK_CONTRIB_VERSION ${VTK_CONTRIB_MAJOR_VERSION}.${VTK_CONTRIB_MINOR_VERSION}.${VTK_CONTRIB_RELEASE_VERSION})
 
 
diff --git a/src/VtkContrib/CMakeLists.txt b/src/VtkContrib/CMakeLists.txt
@@ -52,7 +52,7 @@ elseif (VTK_9)
 	if (MPI_mpi_LIBRARY)
 		set (VTK_PARALLEL_PACKAGES ParallelMPI IOParallel ParallelCore)
 	endif (MPI_mpi_LIBRARY)
-	set (VTK_REQUIRED_PACKAGES  ImagingHybrid ImagingCore IOExport IOImage InteractionWidgets RenderingOpenGL2)
+	set (VTK_REQUIRED_PACKAGES  ImagingHybrid ImagingCore IOExport IOImage InteractionWidgets FiltersGeometry InteractionStyle RenderingOpenGL2 RenderingAnnotation)
 	find_package (VTK 9 REQUIRED COMPONENTS ${VTK_PARALLEL_PACKAGES} ${VTK_REQUIRED_PACKAGES})
 	set (VTK_LIB_DEPENDENCIES ${VTK_LIBRARIES})
 	set (VTK_INC_DEPENDENCIES)	# Empty, not usefull with VTK 9

diff --git a/versions.txt b/versions.txt
@@ -1,3 +1,15 @@
+Version 5.4.2 :
+===============
+
+Retouche d�pendances cmake en VTK 9.
+
+
+Version 5.4.1 : 11/08/23
+===============
+
+Sortie du projet GUIToolkits. Correctif cmake.
+
+
 Version 5.4.0 : 21/06/23
 ===============