Version 6.4.5. Python3 used by default, without explicit request.

LIHPC-Computational-Geometry · Nov 26, 2024 · 7d03ab1 · 7d03ab1
1 parent 0df4112
commit 7d03ab1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -4,7 +4,6 @@
       {
         "name": "ci",
         "cacheVariables": {
-          "USE_PYTHON_3": "ON",
           "GUIToolkitsVariables_ROOT": "$env{INSTALL_DIR}/guitoolkitsvariables",
           "TkUtil_ROOT": "$env{INSTALL_DIR}/tkutil",
           "QtUtil_ROOT": "$env{INSTALL_DIR}/qtutil",

diff --git a/cmake/version.cmake b/cmake/version.cmake
@@ -5,12 +5,12 @@
 # Pour la bibliothèque QtPython :
 set (QT_PYTHON_MAJOR_VERSION "6")
 set (QT_PYTHON_MINOR_VERSION "4")
-set (QT_PYTHON_RELEASE_VERSION "4")
+set (QT_PYTHON_RELEASE_VERSION "5")
 set (QT_PYTHON_VERSION ${QT_PYTHON_MAJOR_VERSION}.${QT_PYTHON_MINOR_VERSION}.${QT_PYTHON_RELEASE_VERSION})
 
 # Pour la bibliothèque QtPython3 :
 set (QT_PYTHON_3_MAJOR_VERSION "6")
 set (QT_PYTHON_3_MINOR_VERSION "4")
-set (QT_PYTHON_3_RELEASE_VERSION "4")
+set (QT_PYTHON_3_RELEASE_VERSION "5")
 set (QT_PYTHON_3_VERSION ${QT_PYTHON_3_MAJOR_VERSION}.${QT_PYTHON_3_MINOR_VERSION}.${QT_PYTHON_3_RELEASE_VERSION})
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,15 +1,12 @@
-if (USE_PYTHON_3)
-    add_subdirectory (QtPython3)
-    if (BUILD_PY_CONSOLE)
-		add_subdirectory (QtPyConsole3)	# Bloque sur la partie moc en de rares circonstances
-	endif (BUILD_PY_CONSOLE)
-elseif (USE_PYTHON_2)
+if (USE_PYTHON_2)
     add_subdirectory (QtPython)
     if (BUILD_PY_CONSOLE)
 		add_subdirectory (QtPyConsole)	# Bloque sur la partie moc en de rares circonstances
     endif (BUILD_PY_CONSOLE)
 else ( )
-	message (STATUS "========================================= VERSION DE PYTHON NON DEFINIE =========================================")
-	message (FATAL_ERROR "==> UTILISEZ -DUSE_PYTHON_2 OU -DUSE_PYTHON_3 A LA LIGNE DE COMMANDE")
+    add_subdirectory (QtPython3)
+    if (BUILD_PY_CONSOLE)
+		add_subdirectory (QtPyConsole3)	# Bloque sur la partie moc en de rares circonstances
+	endif (BUILD_PY_CONSOLE)
 endif (USE_PYTHON_3)
 
diff --git a/versions.txt b/versions.txt
@@ -1,3 +1,9 @@
+Version 6.4.5 : 26/11/24
+===============
+
+Python 3 utilis� par d�faut, sans demande explicite.
+
+
 Version 6.4.4 : 20/11/24
 ===============