Skip to content

Commit 9b69f7f

Browse files
author
Charles PIGNEROL
committed
Version 1.4.2. Porting Qt6. Fix 2.
1 parent a8d588e commit 9b69f7f

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

cmake/common_qt.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ elseif (Qt5_DIR OR Qt5_ROOT)
1414
set (QT_MAJOR 5)
1515
endif (Qt5_FOUND)
1616
else ( ) # Spack ?
17-
find_package (Qt6 REQUIRED COMPONENTS Core)
17+
find_package (Qt6 COMPONENTS Core)
1818
if (Qt6_FOUND)
1919
set (QT_6 ON)
2020
set (QT_MAJOR 6)
2121
else (Qt6_FOUND)
22-
find_package (Qt5 REQUIRED COMPONENTS Core)
22+
find_package (Qt5 COMPONENTS Core)
2323
if (Qt5_FOUND)
2424
set (QT_5 ON)
2525
set (QT_MAJOR 5)

cmake/version.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44

55
set (GUI_TOOLKITS_VARIABLES_MAJOR_VERSION "1")
66
set (GUI_TOOLKITS_VARIABLES_MINOR_VERSION "4")
7-
set (GUI_TOOLKITS_VARIABLES_RELEASE_VERSION "1")
7+
set (GUI_TOOLKITS_VARIABLES_RELEASE_VERSION "2")
88
set (GUI_TOOLKITS_VARIABLES_VERSION ${GUI_TOOLKITS_VARIABLES_MAJOR_VERSION}.${GUI_TOOLKITS_VARIABLES_MINOR_VERSION}.${GUI_TOOLKITS_VARIABLES_RELEASE_VERSION})

versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Version 1.4.1 : 13/12/23
2-
===============
1+
Version 1.4.1/1.4.2 : 13/12/23
2+
=====================
33

44
cmake/common_qt.cmake : correctif pour environnement spack.
55

0 commit comments

Comments
 (0)