diff --git a/CMakePresets.json b/CMakePresets.json index 8491d6a..c79049b 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -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" } } ] } - \ No newline at end of file + diff --git a/cmake/version.cmake b/cmake/version.cmake index e148acf..b2f74ec 100644 --- a/cmake/version.cmake +++ b/cmake/version.cmake @@ -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}) diff --git a/src/PythonUtil/CMakeLists.txt b/src/PythonUtil/CMakeLists.txt index d214de4..946e3c1 100644 --- a/src/PythonUtil/CMakeLists.txt +++ b/src/PythonUtil/CMakeLists.txt @@ -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} diff --git a/versions.txt b/versions.txt index 8bff1a1..6d1ffa6 100644 --- a/versions.txt +++ b/versions.txt @@ -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 ===============