Skip to content

Commit be55668

Browse files
Merge pull request #5 from LIHPC-Computational-Geometry/nopython2
Version 6.2.4. Removed support for python 2.
2 parents 8d2dfc8 + c52f924 commit be55668

File tree

4 files changed

+73
-73
lines changed

4 files changed

+73
-73
lines changed

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 "3")
7+
set (PYTHON_UTIL_RELEASE_VERSION "4")
88
set (PYTHON_UTIL_VERSION ${PYTHON_UTIL_MAJOR_VERSION}.${PYTHON_UTIL_MINOR_VERSION}.${PYTHON_UTIL_RELEASE_VERSION})
99

src/PythonUtil/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@ 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_2)
73-
set (REQUIRED_PYTHON Python3)
74-
else (NOT USE_PYTHON_2)
75-
set (REQUIRED_PYTHON Python2)
76-
endif (NOT USE_PYTHON_2)
77-
7872
# Création du fichier PythonUtilConfig.cmake qui définira PythonUtil_INCLUDE_DIR, PythonUtil_LIB_DIR et PythonUtil_BIN_DIR :
7973
configure_package_config_file (cmake/${CMAKE_PACKAGE_CONFIG_NAME}.cmake.in ${CMAKE_PACKAGE_CONFIG_FILE}
8074
INSTALL_DESTINATION ${CMAKE_CMAKE_DIR}

src/PythonUtil/cmake/PythonUtilConfig.cmake.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include(CMakeFindDependencyMacro)
22
find_dependency (TkUtil)
3-
find_dependency (@REQUIRED_PYTHON@ REQUIRED COMPONENTS Development)
3+
find_dependency (Python3 REQUIRED COMPONENTS Development)
44

55
@PACKAGE_INIT@
66

0 commit comments

Comments
 (0)