From d9c2f95f16200826a892bde0b6d7a5efcd19c5dc Mon Sep 17 00:00:00 2001
From: Charles PIGNEROL <>
Date: Wed, 30 Oct 2024 17:54:13 +0100
Subject: [PATCH] Version 5.7.0. Removed dependency on vtkIOExportOpenGL in VTK
 7.

---
 cmake/version.cmake           | 4 ++--
 cmake/vtkcontrib_common.cmake | 2 +-
 src/VtkContrib/CMakeLists.txt | 7 ++++++-
 versions.txt                  | 6 ++++++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/cmake/version.cmake b/cmake/version.cmake
index 953e13c..b3cf87f 100644
--- a/cmake/version.cmake
+++ b/cmake/version.cmake
@@ -3,8 +3,8 @@
 #
 
 set (VTK_CONTRIB_MAJOR_VERSION "5")
-set (VTK_CONTRIB_MINOR_VERSION "6")
-set (VTK_CONTRIB_RELEASE_VERSION "1")
+set (VTK_CONTRIB_MINOR_VERSION "7")
+set (VTK_CONTRIB_RELEASE_VERSION "0")
 set (VTK_CONTRIB_VERSION ${VTK_CONTRIB_MAJOR_VERSION}.${VTK_CONTRIB_MINOR_VERSION}.${VTK_CONTRIB_RELEASE_VERSION})
 
 
diff --git a/cmake/vtkcontrib_common.cmake b/cmake/vtkcontrib_common.cmake
index f0ff5c9..81bb25c 100644
--- a/cmake/vtkcontrib_common.cmake
+++ b/cmake/vtkcontrib_common.cmake
@@ -9,7 +9,7 @@ if (VTK_7)
 	message (STATUS "========================================= UTILISATION DE VTK 7 =========================================")
 	if (USE_OPENGL_BACKEND)
 		set (MANDATORY_CXX_OPTIONS -DVTKGL -DUSE_OPENGL_BACKEND -DVTK_7)	# Public
-		set (MANDATORY_VTK_OPTIONS "-DvtkRenderingCore_AUTOINIT=3(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingOpenGL)" "-DvtkIOExport_AUTOINIT=1(vtkIOExportOpenGL)")
+		set (MANDATORY_VTK_OPTIONS "-DvtkRenderingCore_AUTOINIT=3(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingOpenGL)")
 	else (USE_OPENGL_BACKEND)
 		set (MANDATORY_CXX_OPTIONS -DVTKGL -DUSE_OPENGL2_BACKEND -DVTK_7)	# Public
 		set (MANDATORY_VTK_OPTIONS "-DvtkRenderingCore_AUTOINIT=3(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingOpenGL2)" "-DvtkIOExport_AUTOINIT=1(vtkIOExportOpenGL2)")
diff --git a/src/VtkContrib/CMakeLists.txt b/src/VtkContrib/CMakeLists.txt
index 6148b02..9b195f0 100644
--- a/src/VtkContrib/CMakeLists.txt
+++ b/src/VtkContrib/CMakeLists.txt
@@ -16,7 +16,12 @@ if (VTK_7)
 		set (VTK_PARALLEL_PACKAGES vtkParallelMPI vtkRenderingParallel vtkParallelCore)
 	endif (MPI_mpi_LIBRARY)
 	if (USE_OPENGL_BACKEND)
-		set (VTK_REQUIRED_PACKAGES vtkRenderingLOD vtkInteractionStyle vtkFiltersHybrid vtkFiltersExtraction vtkFiltersCore vtkCommonTransforms vtkCommonMath vtkInteractionWidgets vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingLabel vtkFiltersImaging vtkRenderingGL2PS vtkIOImage vtkIOLegacy vtkIOExportOpenGL vtkIOExport vtkIOXML vtkIOCore vtkCommonExecutionModel vtkCommonDataModel vtkRenderingAnnotation vtkFiltersSources vtkFiltersGeometry vtkFiltersGeneral vtkRenderingCore vtkCommonSystem vtkCommonCore vtkgl2ps vtkpng vtksys)
+		set (VTK_REQUIRED_PACKAGES vtkRenderingLOD vtkInteractionStyle vtkFiltersHybrid vtkFiltersExtraction vtkFiltersCore #
+                               vtkCommonTransforms vtkCommonMath vtkInteractionWidgets vtkImagingHybrid vtkRenderingOpenGL #
+                               vtkRenderingFreeType vtkRenderingLabel vtkFiltersImaging vtkRenderingGL2PS vtkIOImage vtkIOLegacy #
+                               vtkIOExport vtkIOXML vtkIOCore vtkCommonExecutionModel vtkCommonDataModel vtkRenderingAnnotation #
+                               vtkFiltersSources vtkFiltersGeometry vtkFiltersGeneral vtkRenderingCore vtkCommonSystem vtkCommonCore #
+                               vtkgl2ps vtkpng vtksys)
 		set (VTK_OPENGL_BACKEND OpenGL)
 	else (USE_OPENGL_BACKEND)
 		set (VTK_REQUIRED_PACKAGES vtkRenderingLOD vtkInteractionStyle vtkFiltersHybrid vtkFiltersExtraction vtkFiltersCore #
diff --git a/versions.txt b/versions.txt
index 5feaed0..463ea50 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,3 +1,9 @@
+Version 5.7.0 : 29/10/24
+===============
+
+Suppression des dépendances à vtkIOExportOpenGL en VTK 7.
+
+
 Version 5.6.1 : 21/09/24
 ===============