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

Jump to bottom

Use FindPython from CMake 3.12. #180

Merged
merged 2 commits into from
Sep 18, 2023
Merged

Use FindPython from CMake 3.12. #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70c8439
Use FindPython from CMake 3.12.
Hoikas Jun 15, 2020
35a73a0
Fix compatibility with Python 3.12+.
Hoikas Sep 16, 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
5 changes: 3 additions & 2 deletions .github/workflows/windows-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,9 @@ jobs:
-DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/build/install" `
-DCMAKE_UNITY_BUILD=${{ matrix.platform.unity }} `
-DVCPKG_TARGET_TRIPLET=windows-hsplasma `
-DPYTHON_EXECUTABLE="${{ env.pythonLocation }}/python.exe" `
-DPYTHON_LIBRARY="${{ env.pythonLocation }}/libs/python$("${{ matrix.platform.python }}".replace('.', '')).lib" `
-DPython3_EXECUTABLE="${{ env.pythonLocation }}/python.exe" `
-DPython3_LIBRARY="${{ env.pythonLocation }}/libs/python$("${{ matrix.platform.python }}".replace('.', '')).lib" `
-DPython3_INCLUDE_DIR="${{ env.pythonLocation }}/include" `
-S . -B build

- name: Build
Expand Down
89 changes: 37 additions & 52 deletions Python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
find_package(PythonLibs 3.2 REQUIRED)
# Use only the major.minor version -- no patch, no +, etc
STRING(REGEX REPLACE "([0-9]\\.[0-9]+)[0-9.+]*" "\\1" PYTHONLIBS_VERSION_STRING_FILTERED "${PYTHONLIBS_VERSION_STRING}")
find_package(PythonInterp "${PYTHONLIBS_VERSION_STRING_FILTERED}" REQUIRED)
# make sure the versions match
STRING(REGEX REPLACE "([0-9]\\.[0-9]+)[0-9.+]*" "\\1" PYTHON_VERSION_STRING_FILTERED "${PYTHON_VERSION_STRING}")
if (NOT "${PYTHONLIBS_VERSION_STRING_FILTERED}" STREQUAL "${PYTHON_VERSION_STRING_FILTERED}")
message(FATAL_ERROR "Versions of Python libraries (${PYTHONLIBS_VERSION_STRING_FILTERED}) and Python interpreter (${PYTHON_VERSION_STRING_FILTERED}) do not match. Please configure the paths manually.")
endif()
find_package(Python3 3.2 REQUIRED COMPONENTS Interpreter Development)

if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
set(CMAKE_CXX_FLAGS "-fno-strict-aliasing ${CMAKE_CXX_FLAGS}")
Expand All @@ -22,7 +14,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
endif()
endif()

include_directories(${PYTHON_INCLUDE_DIRS})
include_directories(${CMAKE_CURRENT_SOURCE_DIR})

set(DEBUG_SOURCES
Expand Down Expand Up @@ -737,59 +728,53 @@ set(PYTHON_HEADERS
PyPlasma.h
)

add_library(PyHSPlasma SHARED
${DEBUG_SOURCES} ${DEBUG_HEADERS}
${MATH_SOURCES} ${MATH_HEADERS}
${PRP_ANIM_SOURCES} ${PRP_ANIM_HEADERS}
${PRP_AUDIO_SOURCES} ${PRP_AUDIO_HEADERS}
${PRP_AVATAR_SOURCES} ${PRP_AVATAR_HEADERS}
${PRP_CAMERA_SOURCES} ${PRP_CAMERA_HEADERS}
${PRP_COND_SOURCES} ${PRP_COND_HEADERS}
${PRP_GEOM_SOURCES} ${PRP_GEOM_HEADERS}
${PRP_GUI_SOURCES} ${PRP_GUI_HEADERS}
${PRP_KEYOBJ_SOURCES} ${PRP_KEYOBJ_HEADERS}
${PRP_LIGHT_SOURCES} ${PRP_LIGHT_HEADERS}
${PRP_MSG_SOURCES} ${PRP_MSG_HEADERS}
${PRP_MISC_SOURCES} ${PRP_MISC_HEADERS}
${PRP_MOD_SOURCES} ${PRP_MOD_HEADERS}
${PRP_OBJ_SOURCES} ${PRP_OBJ_HEADERS}
${PRP_PARTICLE_SOURCES} ${PRP_PARTICLE_HEADERS}
${PRP_PHYS_SOURCES} ${PRP_PHYS_HEADERS}
${PRP_REGION_SOURCES} ${PRP_REGION_HEADERS}
${PRP_SURFACE_SOURCES} ${PRP_SURFACE_HEADERS}
${PRP_SOURCES} ${PRP_HEADERS}
${RESMGR_SOURCES} ${RESMGR_HEADERS}
${SDL_SOURCES} ${SDL_HEADERS}
${STREAM_SOURCES} ${STREAM_HEADERS}
${SYS_SOURCES} ${SYS_HEADERS}
${UTIL_SOURCES} ${UTIL_HEADERS}
${VAULT_SOURCES} ${VAULT_HEADERS}
${PYTHON_SOURCES} ${PYTHON_HEADERS}
)

target_link_libraries(PyHSPlasma HSPlasma ${PYTHON_LIBRARIES})
Python3_add_library(PyHSPlasma MODULE
${DEBUG_SOURCES} ${DEBUG_HEADERS}
${MATH_SOURCES} ${MATH_HEADERS}
${PRP_ANIM_SOURCES} ${PRP_ANIM_HEADERS}
${PRP_AUDIO_SOURCES} ${PRP_AUDIO_HEADERS}
${PRP_AVATAR_SOURCES} ${PRP_AVATAR_HEADERS}
${PRP_CAMERA_SOURCES} ${PRP_CAMERA_HEADERS}
${PRP_COND_SOURCES} ${PRP_COND_HEADERS}
${PRP_GEOM_SOURCES} ${PRP_GEOM_HEADERS}
${PRP_GUI_SOURCES} ${PRP_GUI_HEADERS}
${PRP_KEYOBJ_SOURCES} ${PRP_KEYOBJ_HEADERS}
${PRP_LIGHT_SOURCES} ${PRP_LIGHT_HEADERS}
${PRP_MSG_SOURCES} ${PRP_MSG_HEADERS}
${PRP_MISC_SOURCES} ${PRP_MISC_HEADERS}
${PRP_MOD_SOURCES} ${PRP_MOD_HEADERS}
${PRP_OBJ_SOURCES} ${PRP_OBJ_HEADERS}
${PRP_PARTICLE_SOURCES} ${PRP_PARTICLE_HEADERS}
${PRP_PHYS_SOURCES} ${PRP_PHYS_HEADERS}
${PRP_REGION_SOURCES} ${PRP_REGION_HEADERS}
${PRP_SURFACE_SOURCES} ${PRP_SURFACE_HEADERS}
${PRP_SOURCES} ${PRP_HEADERS}
${RESMGR_SOURCES} ${RESMGR_HEADERS}
${SDL_SOURCES} ${SDL_HEADERS}
${STREAM_SOURCES} ${STREAM_HEADERS}
${SYS_SOURCES} ${SYS_HEADERS}
${UTIL_SOURCES} ${UTIL_HEADERS}
${VAULT_SOURCES} ${VAULT_HEADERS}
${PYTHON_SOURCES} ${PYTHON_HEADERS}
)

target_link_libraries(PyHSPlasma PUBLIC HSPlasma)
set_target_properties(PyHSPlasma PROPERTIES PREFIX "")

if(NOT WIN32)
set_target_properties(PyHSPlasma PROPERTIES
SUFFIX ".so"
)

execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import sys, distutils.sysconfig; sys.stdout.write(distutils.sysconfig.get_python_lib(prefix='${CMAKE_INSTALL_PREFIX}'))"
OUTPUT_VARIABLE _PYTHON_LIB_DIR
execute_process(
COMMAND "${Python3_EXECUTABLE}" -c
"import sys, sysconfig; sys.stdout.write(sysconfig.get_path('purelib', vars={'base': '${CMAKE_INSTALL_PREFIX}'}))"
OUTPUT_VARIABLE _PYTHON_LIB_DIR
)
install(TARGETS PyHSPlasma
DESTINATION ${_PYTHON_LIB_DIR}
)
install(FILES PyHSPlasma.pyi DESTINATION ${_PYTHON_LIB_DIR})
else()
set_target_properties(PyHSPlasma PROPERTIES
SUFFIX ".pyd"
)

install(TARGETS PyHSPlasma
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
LIBRARY DESTINATION bin
ARCHIVE DESTINATION lib
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CMake's FindPython3 (source of Python3_add_library) thinks Python extension modules are libraries. 🙄

)
install(FILES PyHSPlasma.pyi DESTINATION bin)
Expand Down
5 changes: 3 additions & 2 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ environment:
CMAKE_GENERATOR: Visual Studio 12 2013
PYTHON_PREFIX: C:\Python34
CMAKE_PARAMS: -DPYTHON_INCLUDE_DIR=C:/Python34/include
-DPYTHON_LIBRARY=C:/Python34/libs/python34.lib
-DPYTHON_EXECUTABLE=C:/Python34/python.exe
-DPython3_LIBRARY=C:/Python34/libs/python34.lib
-DPython3_EXECUTABLE=C:/Python34/python.exe
-DPython3_INCLUDE_DIR=C:/Python34/include
PREFIX_TARGET: vc2013-x86-static
DIST_SUFFIX: '%PREFIX_TARGET%-py34'

Expand Down
Loading