From ad81025f44405505a74dc21326831c1afb2cb85a Mon Sep 17 00:00:00 2001 From: ccptoebeans <> Date: Mon, 16 Feb 2026 13:37:10 +0000 Subject: [PATCH] Upgrade version of greenlet & use new target property for python module path --- CMakeLists.txt | 5 +++-- tests/capiTest/CMakeLists.txt | 2 +- vcpkg.json | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a9a4288..6457448 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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\;$\;${GREENLET_IMPORTED_LOCATION_DIR}/python\;${GREENLET_IMPORTED_LOCATION_DIR}\;${Python3_STDLIB}") + SET(ENV{PYTHONPATH} "${CMAKE_SOURCE_DIR}/python\;$\;${GREENLET_PYTHON_MODULE_DIR}\;${GREENLET_IMPORTED_LOCATION_DIR}\;${Python3_STDLIB}") elseif(APPLE) - SET(ENV{PYTHONPATH} "${CMAKE_SOURCE_DIR}/python:$:${GREENLET_IMPORTED_LOCATION_DIR}/python:${GREENLET_IMPORTED_LOCATION_DIR}:${Python3_STDLIB}") + SET(ENV{PYTHONPATH} "${CMAKE_SOURCE_DIR}/python:$:${GREENLET_PYTHON_MODULE_DIR}:${GREENLET_IMPORTED_LOCATION_DIR}:${Python3_STDLIB}") endif() # Documentation generation is constrained to release builds diff --git a/tests/capiTest/CMakeLists.txt b/tests/capiTest/CMakeLists.txt index eb3b2bf..69d116b 100644 --- a/tests/capiTest/CMakeLists.txt +++ b/tests/capiTest/CMakeLists.txt @@ -36,7 +36,7 @@ set(SCHEDULER_CEXTENSION_MODULE_PATH $) 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( diff --git a/vcpkg.json b/vcpkg.json index ecc7506..41636df 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -6,7 +6,7 @@ }, { "name": "greenlet", - "version>=": "3.0.3" + "version>=": "3.0.3#1" }, { "name": "carbon-core",