Skip to content

Version 6.2.3. Python3 used by default (GUIToolkitsVariables 1.5.3), … #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 26, 2024
Merged

Version 6.2.3. Python3 used by default (GUIToolkitsVariables 1.5.3), … #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
"cacheVariables": {
"GUIToolkitsVariables_ROOT": "$env{INSTALL_DIR}/guitoolkitsvariables",
"TkUtil_ROOT": "$env{INSTALL_DIR}/tkutil",
"TkUtilScripting_ROOT": "$env{INSTALL_DIR}/tkutil",
"USE_PYTHON_3": "ON"
"TkUtilScripting_ROOT": "$env{INSTALL_DIR}/tkutil"
}
}
]
}


2 changes: 1 addition & 1 deletion cmake/version.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

set (PYTHON_UTIL_MAJOR_VERSION "6")
set (PYTHON_UTIL_MINOR_VERSION "2")
set (PYTHON_UTIL_RELEASE_VERSION "2")
set (PYTHON_UTIL_RELEASE_VERSION "3")
set (PYTHON_UTIL_VERSION ${PYTHON_UTIL_MAJOR_VERSION}.${PYTHON_UTIL_MINOR_VERSION}.${PYTHON_UTIL_RELEASE_VERSION})

8 changes: 4 additions & 4 deletions src/PythonUtil/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ set (INCLUDE_INSTALL_DIR include/) # PythonUtil_INCLUDE_DIR avec PythonUtilConf
set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}) # PythonUtil_LIB_DIR avec PythonUtilConfig.cmake.in
#set (RUNTIME_INSTALL_DIR bin/) # PythonUtil_RUNTIME_DIR avec PythonUtilConfig.cmake.in

if (NOT USE_PYTHON_3)
set (REQUIRED_PYTHON Python2)
else (NOT USE_PYTHON_3)
if (NOT USE_PYTHON_2)
set (REQUIRED_PYTHON Python3)
endif (NOT USE_PYTHON_3)
else (NOT USE_PYTHON_2)
set (REQUIRED_PYTHON Python2)
endif (NOT USE_PYTHON_2)

# Création du fichier PythonUtilConfig.cmake qui définira PythonUtil_INCLUDE_DIR, PythonUtil_LIB_DIR et PythonUtil_BIN_DIR :
configure_package_config_file (cmake/${CMAKE_PACKAGE_CONFIG_NAME}.cmake.in ${CMAKE_PACKAGE_CONFIG_FILE}
Expand Down
6 changes: 6 additions & 0 deletions versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
Version 6.2.3 : 26/11/24
===============

Python 3 par d�faut, sans demande explicite.


Version 6.2.2 : 13/12/23
===============

Expand Down