diff options
Diffstat (limited to 'science/py-arbor/files')
| -rw-r--r-- | science/py-arbor/files/patch-CMakeLists.txt | 19 | ||||
| -rw-r--r-- | science/py-arbor/files/patch-pyarb.hpp | 11 |
2 files changed, 23 insertions, 7 deletions
diff --git a/science/py-arbor/files/patch-CMakeLists.txt b/science/py-arbor/files/patch-CMakeLists.txt index b8d189dbb2b4..e8b0d0cf39e4 100644 --- a/science/py-arbor/files/patch-CMakeLists.txt +++ b/science/py-arbor/files/patch-CMakeLists.txt @@ -1,14 +1,20 @@ ---- CMakeLists.txt.orig 2024-08-09 10:22:00 UTC +--- CMakeLists.txt.orig 2025-04-24 10:33:03 UTC +++ CMakeLists.txt -@@ -1,3 +1,7 @@ +@@ -1,3 +1,13 @@ +cmake_minimum_required(VERSION 3.19) + +find_package(Python3 ${arb_py_version} COMPONENTS Interpreter Development REQUIRED) ++find_package(pybind11 REQUIRED) ++ ++set(CMAKE_CXX_STANDARD 20) ++set(CMAKE_CUDA_STANDARD 20) ++set(CMAKE_CXX_STANDARD_REQUIRED ON) ++set(CMAKE_CXX_EXTENSIONS OFF) + include(GNUInstallDirs) - set(PYBIND11_CPP_STANDARD -std=c++17) -@@ -84,14 +88,14 @@ endif() + set(pyarb_source +@@ -73,14 +83,14 @@ endif() endif() # For unit tests on C++ side of Python wrappers @@ -26,10 +32,9 @@ # Set the installation path -@@ -121,5 +125,4 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py +@@ -122,4 +132,4 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py install(TARGETS pyarb DESTINATION ${_python_module_install_path}) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py DESTINATION ${_python_module_install_path}) --install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/stubs/arbor/ DESTINATION ${_python_module_install_path}) -install(FILES ${PROJECT_SOURCE_DIR}/VERSION ${PROJECT_SOURCE_DIR}/README.md ${PROJECT_SOURCE_DIR}/LICENSE DESTINATION ${_python_module_install_path}) -+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../VERSION DESTINATION ${_python_module_install_path}) ++install(FILES ${PROJECT_SOURCE_DIR}/../VERSION DESTINATION ${_python_module_install_path}) diff --git a/science/py-arbor/files/patch-pyarb.hpp b/science/py-arbor/files/patch-pyarb.hpp new file mode 100644 index 000000000000..ab3bb94cf316 --- /dev/null +++ b/science/py-arbor/files/patch-pyarb.hpp @@ -0,0 +1,11 @@ +--- pyarb.hpp.orig 2025-11-02 17:35:26 UTC ++++ pyarb.hpp +@@ -19,7 +19,7 @@ static_assert((PYBIND11_VERSION_HEX >= 0x02080100) + #define PB11_ERR(M, m, p) "Required version of pybind11 is 2.8.1 <= version < 3.0.0 Found " mk_ver(M, m, p) + static_assert((PYBIND11_VERSION_HEX >= 0x02080100) + && +- (PYBIND11_VERSION_HEX < 0x03000000), ++ (PYBIND11_VERSION_HEX < 0x04000000), + PB11_ERR(PYBIND11_VERSION_MAJOR, PYBIND11_VERSION_MINOR, PYBIND11_VERSION_PATCH)); + #undef PB11_ERR + #undef mk_ver |