From 009107cd1ffd1e03174bae88fdc7aac954342475 Mon Sep 17 00:00:00 2001 From: Charles PIGNEROL <> Date: Fri, 6 Dec 2024 07:49:21 +0100 Subject: [PATCH] Version 6.2.4. Removed support for python 2. --- cmake/version.cmake | 2 +- src/PythonUtil/CMakeLists.txt | 6 ------ src/PythonUtil/cmake/PythonUtilConfig.cmake.in | 2 +- versions.txt | 6 ++++++ 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmake/version.cmake b/cmake/version.cmake index b2f74ec..df6afa5 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 "3") +set (PYTHON_UTIL_RELEASE_VERSION "4") 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 946e3c1..59be08b 100644 --- a/src/PythonUtil/CMakeLists.txt +++ b/src/PythonUtil/CMakeLists.txt @@ -69,12 +69,6 @@ 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_2) - set (REQUIRED_PYTHON Python3) -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} INSTALL_DESTINATION ${CMAKE_CMAKE_DIR} diff --git a/src/PythonUtil/cmake/PythonUtilConfig.cmake.in b/src/PythonUtil/cmake/PythonUtilConfig.cmake.in index d7ac6b6..e2cd11b 100644 --- a/src/PythonUtil/cmake/PythonUtilConfig.cmake.in +++ b/src/PythonUtil/cmake/PythonUtilConfig.cmake.in @@ -1,6 +1,6 @@ include(CMakeFindDependencyMacro) find_dependency (TkUtil) -find_dependency (@REQUIRED_PYTHON@ REQUIRED COMPONENTS Development) +find_dependency (Python3 REQUIRED COMPONENTS Development) @PACKAGE_INIT@ diff --git a/versions.txt b/versions.txt index 6d1ffa6..095ecf7 100644 --- a/versions.txt +++ b/versions.txt @@ -1,3 +1,9 @@ +Version 6.2.4 : 06/12/24 +=============== + +Arrêt support Python 2. + + Version 6.2.3 : 26/11/24 ===============