From baf69d948d77e8fe496a82e2fa3b1f41a9b1156f Mon Sep 17 00:00:00 2001 From: clemgaut Date: Tue, 21 Nov 2023 01:07:17 +0100 Subject: [PATCH] Updates pybind to latest (2.11.1) version (#175) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Allows Teaser++ python package building on latest Python versions (3.11) Co-authored-by: Clément Gautrais --- cmake/pybind11.CMakeLists.txt.in | 2 +- python/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/pybind11.CMakeLists.txt.in b/cmake/pybind11.CMakeLists.txt.in index 4252952..b270063 100644 --- a/cmake/pybind11.CMakeLists.txt.in +++ b/cmake/pybind11.CMakeLists.txt.in @@ -5,7 +5,7 @@ project(pybind11-download NONE) include(ExternalProject) ExternalProject_Add(pmc GIT_REPOSITORY https://github.com/pybind/pybind11.git - GIT_TAG v2.4.3 + GIT_TAG v2.11.1 SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/pybind11-src" BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/pybind11-build" CONFIGURE_COMMAND "" diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 9fa9e3b..e85cf24 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -8,10 +8,10 @@ message(STATUS "Python Interpreter Version: ${PYTHON_VERSION_MAJOR}.${PYTHON_VER if (NOT (PYTHON_VERSION_MAJOR EQUAL 2 AND PYTHON_VERSION_MINOR EQUAL 7)) # Hack: VTK used in PCL might add /usr/include/python2.7 to all targets' # INCLUDE_DIRECTORIES properties. We need to remove it. - get_target_property(TEASERPY_NEW_INCLUDE_DIRS teaserpp_python INCLUDE_DIRECTORIES) + get_target_property(TEASERPY_NEW_INCLUDE_DIRS teaserpp_python INTERFACE_INCLUDE_DIRECTORIES) list(FILTER TEASERPY_NEW_INCLUDE_DIRS EXCLUDE REGEX ".*python2.7$") set_target_properties(teaserpp_python - PROPERTIES INCLUDE_DIRECTORIES "${TEASERPY_NEW_INCLUDE_DIRS}") + PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${TEASERPY_NEW_INCLUDE_DIRS}") endif () target_link_libraries(teaserpp_python PUBLIC teaser_registration)