From 8c304b27caadd79811106e40b24b4fe05a9db8ec Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Wed, 3 Jan 2024 08:55:09 -0800 Subject: [PATCH 1/3] Use pybind11 right after PR pybind/pybind11#4786 was merged --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c1e6d9..7d88abd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ FetchContent_Declare( FetchContent_Declare( pybind11 - URL https://github.com/pybind/pybind11/archive/7d538a42750c8580eeaac10e505840a3694b04c8.tar.gz) + URL https://github.com/pybind/pybind11/archive/daea1130b4245d23ce000266b1ed5a340d1a1e13.tar.gz) FetchContent_MakeAvailable(abseil-cpp pybind11) From be0ffdea247e3b2a7161cb1976354fe8eb52a42a Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Wed, 3 Jan 2024 11:10:54 -0800 Subject: [PATCH 2/3] set Python_EXECUTABLE --- pybind11_abseil/tests/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pybind11_abseil/tests/CMakeLists.txt b/pybind11_abseil/tests/CMakeLists.txt index 9ac8091..4dde411 100644 --- a/pybind11_abseil/tests/CMakeLists.txt +++ b/pybind11_abseil/tests/CMakeLists.txt @@ -1,5 +1,9 @@ # cpp_capsule_tools_testing ==================================================== +if(DEFINED PYTHON_EXECUTABLE AND NOT DEFINED Python_EXECUTABLE) + set(Python_EXECUTABLE "${PYTHON_EXECUTABLE}") +endif() + pybind11_add_module(cpp_capsule_tools_testing SHARED cpp_capsule_tools_testing.cc) From 283cf4af68964822f2fdaf149b6714f9dffcb872 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Wed, 3 Jan 2024 11:17:09 -0800 Subject: [PATCH 3/3] set Python_EXECUTABLE in all CMakeLists.txt files --- CMakeLists.txt | 4 ++++ pybind11_abseil/CMakeLists.txt | 4 ++++ pybind11_abseil/cpp_capsule_tools/CMakeLists.txt | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d88abd..212aaf0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,6 +24,10 @@ FetchContent_Declare( FetchContent_MakeAvailable(abseil-cpp pybind11) +if(DEFINED PYTHON_EXECUTABLE AND NOT DEFINED Python_EXECUTABLE) + set(Python_EXECUTABLE "${PYTHON_EXECUTABLE}") +endif() + set(TOP_LEVEL_DIR ${CMAKE_CURRENT_LIST_DIR}) include_directories(${TOP_LEVEL_DIR} ${PYTHON_INCLUDE_DIR} ${pybind11_INCLUDE_DIRS}) diff --git a/pybind11_abseil/CMakeLists.txt b/pybind11_abseil/CMakeLists.txt index c0f1236..3c61a5d 100644 --- a/pybind11_abseil/CMakeLists.txt +++ b/pybind11_abseil/CMakeLists.txt @@ -1,3 +1,7 @@ +if(DEFINED PYTHON_EXECUTABLE AND NOT DEFINED Python_EXECUTABLE) + set(Python_EXECUTABLE "${PYTHON_EXECUTABLE}") +endif() + add_subdirectory(cpp_capsule_tools) # absl_casters ============================================================ diff --git a/pybind11_abseil/cpp_capsule_tools/CMakeLists.txt b/pybind11_abseil/cpp_capsule_tools/CMakeLists.txt index 6ad81b9..5115ce4 100644 --- a/pybind11_abseil/cpp_capsule_tools/CMakeLists.txt +++ b/pybind11_abseil/cpp_capsule_tools/CMakeLists.txt @@ -1,3 +1,7 @@ +if(DEFINED PYTHON_EXECUTABLE AND NOT DEFINED Python_EXECUTABLE) + set(Python_EXECUTABLE "${PYTHON_EXECUTABLE}") +endif() + # void_ptr_from_capsule ======================================================== add_library(void_ptr_from_capsule STATIC void_ptr_from_capsule.cc)