Merge pull request #9 from LIHPC-Computational-Geometry/ci_containers_fix

CharlesPignerol · web-flow · commit c241400e7615 · 2025-06-26T16:24:49.000+02:00
Cmake CI fix for contaniers.
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -9,6 +9,7 @@
           "GUIToolkitsVariables_ROOT": "$env{INSTALL_DIR}/guitoolkitsvariables",
           "VtkContrib_ROOT": "$env{INSTALL_DIR}/vtkcontrib",
           "QtUtil_ROOT": "$env{INSTALL_DIR}/qtutil",
+          "PrefsQt_ROOT": "$env{INSTALL_DIR}/preferences",
           "TkUtil_ROOT": "$env{INSTALL_DIR}/tkutil",
           "VTK_ROOT": "$env{INSTALL_DIR}/VTK-7.1.1"
         }
diff --git a/cmake/version.cmake b/cmake/version.cmake
@@ -4,7 +4,7 @@
 
 set (QT_VTK_MAJOR_VERSION "8")
 set (QT_VTK_MINOR_VERSION "8")
-set (QT_VTK_RELEASE_VERSION "1")
+set (QT_VTK_RELEASE_VERSION "2")
 set (QT_VTK_VERSION ${QT_VTK_MAJOR_VERSION}.${QT_VTK_MINOR_VERSION}.${QT_VTK_RELEASE_VERSION})
 
 
diff --git a/versions.txt b/versions.txt
@@ -1,5 +1,11 @@
 A FAIRE : tester le vtkIntersectionPolyDataFilter de VTK 7, voir si de base il propose les services attendus (Inner, ...).
 
+Version 8.8.2 : 26/06/25
+===============
+
+Actualisation CMakePresets.json pour CI conteneurs.
+
+
 Version 8.8.1 : 18/04/25
 ===============
 

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`"GUIToolkitsVariables_ROOT": "$env{INSTALL_DIR}/guitoolkitsvariables",`
`10`	`10`	`"VtkContrib_ROOT": "$env{INSTALL_DIR}/vtkcontrib",`
`11`	`11`	`"QtUtil_ROOT": "$env{INSTALL_DIR}/qtutil",`
	`12`	`+ "PrefsQt_ROOT": "$env{INSTALL_DIR}/preferences",`
`12`	`13`	`"TkUtil_ROOT": "$env{INSTALL_DIR}/tkutil",`
`13`	`14`	`"VTK_ROOT": "$env{INSTALL_DIR}/VTK-7.1.1"`
`14`	`15`	`}`