Version 1.4.1. Porting Qt6. Fix 1.

Author: Charles PIGNEROL

cmake/common_qt.cmake

@@ -13,7 +13,19 @@ elseif (Qt5_DIR OR Qt5_ROOT)
 		set (QT_5 ON)
 		set (QT_MAJOR 5)
 	endif (Qt5_FOUND)
-else ( )
-	message (FATAL_ERROR "Version majeure de Qt non gérée.")
+else ( )	# Spack ?
+	find_package (Qt6 REQUIRED COMPONENTS Core)
+	if (Qt6_FOUND)
+		set (QT_6 ON)
+		set (QT_MAJOR 6)
+	else (Qt6_FOUND)
+		find_package (Qt5 REQUIRED COMPONENTS Core)
+		if (Qt5_FOUND)
+			set (QT_5 ON)
+			set (QT_MAJOR 5)
+		else (Qt5_FOUND)
+			message (FATAL_ERROR "Version majeure de Qt non gérée.")
+		endif (Qt5_FOUND)
+	endif (Qt6_FOUND)
 endif ( )
 

cmake/version.cmake

@@ -4,5 +4,5 @@
 
 set (GUI_TOOLKITS_VARIABLES_MAJOR_VERSION "1")
 set (GUI_TOOLKITS_VARIABLES_MINOR_VERSION "4")
-set (GUI_TOOLKITS_VARIABLES_RELEASE_VERSION "0")
+set (GUI_TOOLKITS_VARIABLES_RELEASE_VERSION "1")
 set (GUI_TOOLKITS_VARIABLES_VERSION ${GUI_TOOLKITS_VARIABLES_MAJOR_VERSION}.${GUI_TOOLKITS_VARIABLES_MINOR_VERSION}.${GUI_TOOLKITS_VARIABLES_RELEASE_VERSION})

versions.txt

@@ -1,3 +1,9 @@
+Version 1.4.1 : 13/12/23
+===============
+
+cmake/common_qt.cmake : correctif pour environnement spack.
+
+
 Version 1.4.0 : 13/12/23
 ===============