Skip to content

Upgrade version of greenlet & use new target property for python module path #35

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

Merged
ccptoebeans merged 1 commit into from
Feb 16, 2026
Merged

Upgrade version of greenlet & use new target property for python module path #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,14 @@ endif()
# Provide an install target iff this is the top level project only
if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
get_target_property(GREENLET_IMPORTED_LOCATION Greenlet IMPORTED_LOCATION)
get_target_property(GREENLET_PYTHON_MODULE_DIR Greenlet PYTHON_MODULE_DIR)
get_filename_component(GREENLET_IMPORTED_LOCATION_DIR ${GREENLET_IMPORTED_LOCATION} DIRECTORY)

# Store python path in environment for subsequent build steps
if(WIN32)
SET(ENV{PYTHONPATH} "${CMAKE_SOURCE_DIR}/python\;$<TARGET_FILE_DIR:Scheduler>\;${GREENLET_IMPORTED_LOCATION_DIR}/python\;${GREENLET_IMPORTED_LOCATION_DIR}\;${Python3_STDLIB}")
SET(ENV{PYTHONPATH} "${CMAKE_SOURCE_DIR}/python\;$<TARGET_FILE_DIR:Scheduler>\;${GREENLET_PYTHON_MODULE_DIR}\;${GREENLET_IMPORTED_LOCATION_DIR}\;${Python3_STDLIB}")
elseif(APPLE)
SET(ENV{PYTHONPATH} "${CMAKE_SOURCE_DIR}/python:$<TARGET_FILE_DIR:Scheduler>:${GREENLET_IMPORTED_LOCATION_DIR}/python:${GREENLET_IMPORTED_LOCATION_DIR}:${Python3_STDLIB}")
SET(ENV{PYTHONPATH} "${CMAKE_SOURCE_DIR}/python:$<TARGET_FILE_DIR:Scheduler>:${GREENLET_PYTHON_MODULE_DIR}:${GREENLET_IMPORTED_LOCATION_DIR}:${Python3_STDLIB}")
endif()

# Documentation generation is constrained to release builds
Expand Down
2 changes: 1 addition & 1 deletion tests/capiTest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ set(SCHEDULER_CEXTENSION_MODULE_PATH $<TARGET_FILE_DIR:Scheduler>)
set(SCHEDULER_PACKAGE_PATH "${CMAKE_SOURCE_DIR}/python")
set(STDLIB_PATH ${Python3_STDLIB})
set(GREENLET_CEXTENSION_MODULE_PATH ${GREENLET_IMPORTED_LOCATION_DIR})
set(GREENLET_MODULE_PATH ${GREENLET_IMPORTED_LOCATION_DIR}/python)
set(GREENLET_MODULE_PATH ${GREENLET_PYTHON_MODULE_DIR})

if (WIN32)
add_custom_command(
Expand Down
2 changes: 1 addition & 1 deletion vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
{
"name": "greenlet",
"version>=": "3.0.3"
"version>=": "3.0.3#1"
},
{
"name": "carbon-core",
Expand Down