From 7d03ab104578d2189c7811fb04bfdefd38fd838d Mon Sep 17 00:00:00 2001
From: Charles PIGNEROL <>
Date: Tue, 26 Nov 2024 09:07:35 +0100
Subject: [PATCH] Version 6.4.5. Python3 used by default, without explicit
 request.

---
 CMakePresets.json   |  1 -
 cmake/version.cmake |  4 ++--
 src/CMakeLists.txt  | 13 +++++--------
 versions.txt        |  6 ++++++
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/CMakePresets.json b/CMakePresets.json
index 7cbaacb..208f670 100644
--- 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
index af2624c..b684db6 100644
--- 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
index e06b7ab..7162582 100644
--- 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
index bc851b0..90d3f20 100644
--- 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
 ===============