Skip to content

Commit eb066b5

Browse files
author
Charles PIGNEROL
committed
Version 6.2.3. Python3 used by default (GUIToolkitsVariables 1.5.3), without explicit request.
1 parent 3ac27b1 commit eb066b5

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

CMakePresets.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
"cacheVariables": {
77
"GUIToolkitsVariables_ROOT": "$env{INSTALL_DIR}/guitoolkitsvariables",
88
"TkUtil_ROOT": "$env{INSTALL_DIR}/tkutil",
9-
"TkUtilScripting_ROOT": "$env{INSTALL_DIR}/tkutil",
10-
"USE_PYTHON_3": "ON"
9+
"TkUtilScripting_ROOT": "$env{INSTALL_DIR}/tkutil"
1110
}
1211
}
1312
]
1413
}
15-
14+

cmake/version.cmake

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

55
set (PYTHON_UTIL_MAJOR_VERSION "6")
66
set (PYTHON_UTIL_MINOR_VERSION "2")
7-
set (PYTHON_UTIL_RELEASE_VERSION "2")
7+
set (PYTHON_UTIL_RELEASE_VERSION "3")
88
set (PYTHON_UTIL_VERSION ${PYTHON_UTIL_MAJOR_VERSION}.${PYTHON_UTIL_MINOR_VERSION}.${PYTHON_UTIL_RELEASE_VERSION})
99

src/PythonUtil/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ set (INCLUDE_INSTALL_DIR include/) # PythonUtil_INCLUDE_DIR avec PythonUtilConf
6969
set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}) # PythonUtil_LIB_DIR avec PythonUtilConfig.cmake.in
7070
#set (RUNTIME_INSTALL_DIR bin/) # PythonUtil_RUNTIME_DIR avec PythonUtilConfig.cmake.in
7171

72-
if (NOT USE_PYTHON_3)
73-
set (REQUIRED_PYTHON Python2)
74-
else (NOT USE_PYTHON_3)
72+
if (NOT USE_PYTHON_2)
7573
set (REQUIRED_PYTHON Python3)
76-
endif (NOT USE_PYTHON_3)
74+
else (NOT USE_PYTHON_2)
75+
set (REQUIRED_PYTHON Python2)
76+
endif (NOT USE_PYTHON_2)
7777

7878
# Création du fichier PythonUtilConfig.cmake qui définira PythonUtil_INCLUDE_DIR, PythonUtil_LIB_DIR et PythonUtil_BIN_DIR :
7979
configure_package_config_file (cmake/${CMAKE_PACKAGE_CONFIG_NAME}.cmake.in ${CMAKE_PACKAGE_CONFIG_FILE}

versions.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Version 6.2.3 : 26/11/24
2+
===============
3+
4+
Python 3 par d�faut, sans demande explicite.
5+
6+
17
Version 6.2.2 : 13/12/23
28
===============
39

0 commit comments

Comments
 (0)