diff --git a/cmake/ConfigureOpenGeode.cmake b/cmake/ConfigureOpenGeode.cmake index b498b55c0..3355d6ba1 100644 --- a/cmake/ConfigureOpenGeode.cmake +++ b/cmake/ConfigureOpenGeode.cmake @@ -95,14 +95,16 @@ if(OPENGEODE_WITH_PYTHON OR INCLUDE_PYBIND11) add_dependencies(download pybind11-download) endif() +include(GNUInstallDirs) add_custom_target(post_install ALL COMMAND ${CMAKE_COMMAND} -E create_symlink ${OpenGeode_PATH_INSTALL}/bin ${PROJECT_BINARY_DIR}/bin - COMMAND ${CMAKE_COMMAND} -E create_symlink ${OpenGeode_PATH_INSTALL}/lib ${PROJECT_BINARY_DIR}/lib + COMMAND ${CMAKE_COMMAND} -E create_symlink ${OpenGeode_PATH_INSTALL}/${CMAKE_INSTALL_LIBDIR} ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ${OpenGeode_PATH_INSTALL}/cmake ${PROJECT_BINARY_DIR}/cmake COMMAND ${CMAKE_COMMAND} -E create_symlink ${OpenGeode_PATH_INSTALL}/include ${PROJECT_BINARY_DIR}/include COMMAND ${CMAKE_COMMAND} -E create_symlink ${OpenGeode_PATH_INSTALL}/share ${PROJECT_BINARY_DIR}/share DEPENDS - opengeode) + opengeode +) install(DIRECTORY ${OpenGeode_PATH_INSTALL}/ DESTINATION .) diff --git a/cmake/ConfigurePybind11.cmake b/cmake/ConfigurePybind11.cmake index 170e7634a..e7ecf46d5 100644 --- a/cmake/ConfigurePybind11.cmake +++ b/cmake/ConfigurePybind11.cmake @@ -26,7 +26,7 @@ ExternalProject_Add(pybind11 BINARY_DIR ${PYBIND11_PATH}/build STAMP_DIR ${PYBIND11_PATH}/stamp GIT_REPOSITORY https://github.com/pybind/pybind11 - GIT_TAG v3.0.2 + GIT_TAG v3.0.4 GIT_SHALLOW ON GIT_PROGRESS ON CMAKE_GENERATOR ${CMAKE_GENERATOR} diff --git a/cmake/OpenGeode.cmake b/cmake/OpenGeode.cmake index 68ba4ae98..164304187 100644 --- a/cmake/OpenGeode.cmake +++ b/cmake/OpenGeode.cmake @@ -68,7 +68,9 @@ if(NOT BUILD_SHARED_LIBS) endif() if(OPENGEODE_WITH_PYTHON OR INCLUDE_PYBIND11) - find_package(pybind11 REQUIRED CONFIG NO_DEFAULT_PATH PATHS ${PYBIND11_INSTALL_PREFIX}) + if(OPENGEODE_WITH_PYTHON) + find_package(pybind11 REQUIRED CONFIG NO_DEFAULT_PATH PATHS ${PYBIND11_INSTALL_PREFIX}) + endif() install( DIRECTORY ${PYBIND11_INSTALL_PREFIX}/ diff --git a/cmake/pyproject.toml.in b/cmake/pyproject.toml.in index 3add57cbc..0a8888352 100644 --- a/cmake/pyproject.toml.in +++ b/cmake/pyproject.toml.in @@ -27,7 +27,7 @@ name = "${GEODE_WHEEL_NAME}" version = "${WHEEL_VERSION}" description = "${GEODE_WHEEL_DESCRIPTION}" authors = [{name = "Geode-solutions", email = "contact@geode-solutions.com"}] -requires-python = ">=3.9,<3.13" +requires-python = ">=3.10,<3.15" license = {text = "${GEODE_WHEEL_LICENSE}"} dynamic = ["dependencies", "readme"] diff --git a/include/geode/mesh/helpers/detail/component_identifier.hpp b/include/geode/mesh/helpers/detail/component_identifier.hpp index 35ea85854..af281deba 100644 --- a/include/geode/mesh/helpers/detail/component_identifier.hpp +++ b/include/geode/mesh/helpers/detail/component_identifier.hpp @@ -90,7 +90,7 @@ namespace geode template < index_t dimension > class SurfaceIdentifier { - OPENGEODE_DISABLE_COPY_AND_MOVE( SurfaceIdentifier< dimension > ); + OPENGEODE_DISABLE_COPY_AND_MOVE( SurfaceIdentifier ); public: explicit SurfaceIdentifier( diff --git a/src/geode/mesh/helpers/detail/component_identifier.cpp b/src/geode/mesh/helpers/detail/component_identifier.cpp index 662230cd1..48b1e8b68 100644 --- a/src/geode/mesh/helpers/detail/component_identifier.cpp +++ b/src/geode/mesh/helpers/detail/component_identifier.cpp @@ -66,7 +66,7 @@ namespace geode template < typename Mesh > class Propagator { - OPENGEODE_DISABLE_COPY_AND_MOVE( Propagator< Mesh > ); + OPENGEODE_DISABLE_COPY_AND_MOVE( Propagator ); public: virtual ~Propagator() = default;