Skip to content
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

bring python2 support back #630

Merged
merged 8 commits into from
Nov 2, 2023
Merged

bring python2 support back #630

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1f4b461
python: reorder
nim65s Oct 30, 2023
78aecc2
python: bring python 2 support back
nim65s Oct 30, 2023
696cad2
python: clean temporary variables names
nim65s Oct 31, 2023
ebd51ab
python: clean else()/endif()
nim65s Oct 31, 2023
7ed114a
python: Use PYTHON_VERSION_MAJOR when using PythonInterp
jorisv Nov 2, 2023
eafcead
python: Add debug output
jorisv Nov 2, 2023
2919979
python: Add quote around python command
jorisv Nov 2, 2023
9a17269
python: remove debug messages
jorisv Nov 2, 2023
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
95 changes: 57 additions & 38 deletions python.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ macro(FINDPYTHON)
endif()
endif()

if(NOT DEFINED Python_EXCUTABLE)
if(NOT DEFINED Python_EXECUTABLE)
set(Python_EXECUTABLE ${PYTHON_EXECUTABLE})
endif()
else()
Expand All @@ -134,25 +134,32 @@ macro(FINDPYTHON)
ERROR_VARIABLE _PYTHON_VERSION_OUTPUT
OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE)

if(NOT "${_PYTHON_VERSION_RESULT_VARIABLE}" STREQUAL "0")
message(FATAL_ERROR "${PYTHON_EXECUTABLE} --version did not succeed.")
endif()
string(REGEX REPLACE "Python " "" _PYTHON_VERSION
${_PYTHON_VERSION_OUTPUT})
string(REGEX REPLACE "\\." ";" _PYTHON_VERSION ${_PYTHON_VERSION})
list(GET _PYTHON_VERSION 0 _PYTHON_VERSION_MAJOR)

# Provide some hints according to the current PYTHON_EXECUTABLE
if(NOT DEFINED PYTHON_INCLUDE_DIR)
if(_PYTHON_VERSION_MAJOR EQUAL "2")
set(_PYTHON_INCLUDE_DIR_CMD
"import distutils.sysconfig as sysconfig; print(sysconfig.get_python_inc())"
)
else()
set(_PYTHON_INCLUDE_DIR_CMD
"import sysconfig; print(sysconfig.get_path('include'))")
endif()
execute_process(
COMMAND "${PYTHON_EXECUTABLE}" "-c"
"import sysconfig; print(sysconfig.get_path('include'))"
COMMAND "${PYTHON_EXECUTABLE}" "-c" "${_PYTHON_INCLUDE_DIR_CMD}"
OUTPUT_VARIABLE PYTHON_INCLUDE_DIR
ERROR_QUIET)
string(STRIP "${PYTHON_INCLUDE_DIR}" PYTHON_INCLUDE_DIR)
file(TO_CMAKE_PATH "${PYTHON_INCLUDE_DIR}" PYTHON_INCLUDE_DIR)
endif()

if(NOT "${_PYTHON_VERSION_RESULT_VARIABLE}" STREQUAL "0")
message(FATAL_ERROR "${PYTHON_EXECUTABLE} --version did not succeed.")
endif(NOT "${_PYTHON_VERSION_RESULT_VARIABLE}" STREQUAL "0")
string(REGEX REPLACE "Python " "" _PYTHON_VERSION
${_PYTHON_VERSION_OUTPUT})
string(REGEX REPLACE "\\." ";" _PYTHON_VERSION ${_PYTHON_VERSION})
list(GET _PYTHON_VERSION 0 _PYTHON_VERSION_MAJOR)

# Hint for finding the right Python version
set(Python_EXECUTABLE ${PYTHON_EXECUTABLE})
set(Python${_PYTHON_VERSION_MAJOR}_EXECUTABLE ${PYTHON_EXECUTABLE})
Expand All @@ -170,11 +177,11 @@ macro(FINDPYTHON)
message(FATAL_ERROR "Python executable has not been found.")
else()
set(_PYTHON_VERSION_MAJOR 3)
endif(NOT Python3_FOUND)
endif()
else()
set(_PYTHON_VERSION_MAJOR 2)
endif(NOT Python2_FOUND)
endif(PYTHON_EXECUTABLE)
endif()
endif()

set(_PYTHON_PREFIX "Python${_PYTHON_VERSION_MAJOR}")

Expand Down Expand Up @@ -202,29 +209,36 @@ macro(FINDPYTHON)
file(TO_CMAKE_PATH "${NUMPY_INCLUDE_DIRS}" NUMPY_INCLUDE_DIRS)
endif()

else(NOT CMAKE_VERSION VERSION_LESS "3.12")
else()

find_package(PythonInterp ${ARGN})
if(NOT ${PYTHONINTERP_FOUND} STREQUAL TRUE)
message(FATAL_ERROR "Python executable has not been found.")
endif(NOT ${PYTHONINTERP_FOUND} STREQUAL TRUE)
endif()
message(STATUS "PythonInterp: ${PYTHON_EXECUTABLE}")

# Set PYTHON_INCLUDE_DIR variables if it is not defined by the user
if(DEFINED PYTHON_EXECUTABLE)
# Retrieve the corresponding value of PYTHON_INCLUDE_DIR if it is not
# defined
if(NOT DEFINED PYTHON_INCLUDE_DIR)
if(PYTHON_VERSION_MAJOR EQUAL "2")
set(_PYTHON_INCLUDE_DIR_CMD
"import distutils.sysconfig as sysconfig; print(sysconfig.get_python_inc())"
)
else()
set(_PYTHON_INCLUDE_DIR_CMD
"import sysconfig; print(sysconfig.get_path('include'))")
endif()
execute_process(
COMMAND "${PYTHON_EXECUTABLE}" "-c"
"import sysconfig; print(sysconfig.get_path('include'))"
COMMAND "${PYTHON_EXECUTABLE}" "-c" "${_PYTHON_INCLUDE_DIR_CMD}"
OUTPUT_VARIABLE PYTHON_INCLUDE_DIR
ERROR_QUIET)
string(STRIP "${PYTHON_INCLUDE_DIR}" PYTHON_INCLUDE_DIR)
endif(NOT DEFINED PYTHON_INCLUDE_DIR)
endif()
set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR})

endif(DEFINED PYTHON_EXECUTABLE)
endif()

# Inform PythonLibs of the required version of PythonInterp
set(PYTHONLIBS_VERSION_STRING ${PYTHON_VERSION_STRING})
Expand All @@ -233,7 +247,7 @@ macro(FINDPYTHON)
message(STATUS "PythonLibraries: ${PYTHON_LIBRARIES}")
if(NOT ${PYTHONLIBS_FOUND} STREQUAL TRUE)
message(FATAL_ERROR "Python has not been found.")
endif(NOT ${PYTHONLIBS_FOUND} STREQUAL TRUE)
endif()

string(REPLACE "." ";" _PYTHONLIBS_VERSION ${PYTHONLIBS_VERSION_STRING})
list(GET _PYTHONLIBS_VERSION 0 PYTHONLIBS_VERSION_MAJOR)
Expand All @@ -245,10 +259,9 @@ macro(FINDPYTHON)
FATAL_ERROR
"Python interpreter and libraries are in different version: ${PYTHON_VERSION_STRING} vs ${PYTHONLIBS_VERSION_STRING}"
)
endif(NOT ${PYTHON_VERSION_MAJOR} EQUAL ${PYTHONLIBS_VERSION_MAJOR}
OR NOT ${PYTHON_VERSION_MINOR} EQUAL ${PYTHONLIBS_VERSION_MINOR})
endif()

endif(NOT CMAKE_VERSION VERSION_LESS "3.12")
endif()

# Find PYTHON_LIBRARY_DIRS
get_filename_component(PYTHON_LIBRARY_DIRS "${PYTHON_LIBRARIES}" PATH)
Expand All @@ -257,42 +270,48 @@ macro(FINDPYTHON)

if(PYTHON_SITELIB)
file(TO_CMAKE_PATH "${PYTHON_SITELIB}" PYTHON_SITELIB)
else(PYTHON_SITELIB)
else()
# Use either site-packages (default) or dist-packages (Debian packages)
# directory
option(PYTHON_DEB_LAYOUT "Enable Debian-style Python package layout" OFF)
# ref. https://docs.python.org/3/library/site.html
option(PYTHON_STANDARD_LAYOUT "Enable standard Python package layout" OFF)

if(PYTHON_STANDARD_LAYOUT)
set(PYTHON_SITELIB_CMD
set(_PYTHON_SITELIB_CMD
"import sys, os; print(os.sep.join(['lib', 'python' + '.'.join(sys.version.split('.')[:2]), 'site-packages']))"
)
else(PYTHON_STANDARD_LAYOUT)
set(PYTHON_SITELIB_CMD
"import sysconfig; from pathlib import Path; print(Path(sysconfig.get_path('purelib')).relative_to(sysconfig.get_path('data')))"
)
endif(PYTHON_STANDARD_LAYOUT)
else()
if(PYTHON_VERSION_MAJOR EQUAL "2")
set(_PYTHON_SITELIB_CMD
"from distutils import sysconfig; print(sysconfig.get_python_lib(prefix='', plat_specific=False))"
)
else()
set(_PYTHON_SITELIB_CMD
"import sysconfig; from pathlib import Path; print(Path(sysconfig.get_path('purelib')).relative_to(sysconfig.get_path('data')))"
)
endif()
endif()

execute_process(
COMMAND "${PYTHON_EXECUTABLE}" "-c" "${PYTHON_SITELIB_CMD}"
COMMAND "${PYTHON_EXECUTABLE}" "-c" "${_PYTHON_SITELIB_CMD}"
OUTPUT_VARIABLE PYTHON_SITELIB
OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)

# Keep compatility with former jrl-cmake-modules versions
if(PYTHON_DEB_LAYOUT)
string(REPLACE "site-packages" "dist-packages" PYTHON_SITELIB
"${PYTHON_SITELIB}")
endif(PYTHON_DEB_LAYOUT)
endif()

# If PYTHON_PACKAGES_DIR is defined, then force the Python packages
# directory name
if(PYTHON_PACKAGES_DIR)
string(REGEX
REPLACE "(site-packages|dist-packages)" "${PYTHON_PACKAGES_DIR}"
PYTHON_SITELIB "${PYTHON_SITELIB}")
endif(PYTHON_PACKAGES_DIR)
endif(PYTHON_SITELIB)
endif()
endif()

message(STATUS "Python site lib: ${PYTHON_SITELIB}")
message(STATUS "Python include dirs: ${PYTHON_INCLUDE_DIRS}")
Expand All @@ -307,7 +326,7 @@ macro(FINDPYTHON)
"from sysconfig import get_config_var; print('.' + get_config_var('SOABI'))"
OUTPUT_VARIABLE PYTHON_SOABI)
string(STRIP ${PYTHON_SOABI} PYTHON_SOABI)
endif(PYTHON_VERSION_MAJOR EQUAL 3 AND NOT WIN32)
endif()

# Get PYTHON_EXT_SUFFIX
set(PYTHON_EXT_SUFFIX "")
Expand All @@ -318,7 +337,7 @@ macro(FINDPYTHON)
"from sysconfig import get_config_var; print(get_config_var('EXT_SUFFIX'))"
OUTPUT_VARIABLE PYTHON_EXT_SUFFIX)
string(STRIP ${PYTHON_EXT_SUFFIX} PYTHON_EXT_SUFFIX)
endif(PYTHON_VERSION_MAJOR EQUAL 3)
endif()
if("${PYTHON_EXT_SUFFIX}" STREQUAL "")
if(WIN32)
set(PYTHON_EXT_SUFFIX ".pyd")
Expand Down Expand Up @@ -433,7 +452,7 @@ macro(DYNAMIC_GRAPH_PYTHON_MODULE SUBMODULENAME LIBRARYNAME TARGETNAME)

if(UNIX AND NOT APPLE)
target_link_libraries(${PYTHON_MODULE} PUBLIC "-Wl,--no-as-needed")
endif(UNIX AND NOT APPLE)
endif()
target_link_libraries(${PYTHON_MODULE} PUBLIC ${LIBRARYNAME}
dynamic-graph::dynamic-graph)
target_link_boost_python(${PYTHON_MODULE} PUBLIC)
Expand Down