diff --git a/CMakeLists.txt b/CMakeLists.txt index 729384b..8817b45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,9 +83,9 @@ set_target_properties(manifold PROPERTIES LINKER_LANGUAGE CXX) target_include_directories(manifold PUBLIC ${MANIFOLD_SRC_DIR}) target_include_directories(manifold PRIVATE ${EXTERNAL_DEP_DIR}/manifold/3rd) if (CMAKE_BUILD_TYPE STREQUAL "Debug") - target_compile_options(manifold PRIVATE "${CMAKE_CXX_FLAGS} -Wall -pthread -DWITH_OMP -Wno-int-in-bool-context -Wsign-compare -fsanitize=address") + target_compile_options(manifold PRIVATE -Wall -pthread -DWITH_OMP -Wno-int-in-bool-context -Wsign-compare -fsanitize=address) else() - target_compile_options(manifold PRIVATE "${CMAKE_CXX_FLAGS} -DWITH_OMP ") + target_compile_options(manifold PRIVATE -DWITH_OMP) endif() diff --git a/pyproject.toml b/pyproject.toml index caa7584..a1a499a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["setuptools>=42", "wheel", "scipy", "numpy", "cmake>=3.2"] +requires = ["setuptools>=42", "wheel", "scipy", "numpy", "cmake>=3.2,<4"] build-backend = "setuptools.build_meta" diff --git a/src/common/ply_loader.h b/src/common/ply_loader.h index 765f806..dafacd3 100644 --- a/src/common/ply_loader.h +++ b/src/common/ply_loader.h @@ -74,7 +74,7 @@ pybind11::array ply_data_to_array(std::shared_ptr attrib) { if (attrib->count == 0) { return pybind11::array(attrib_dtype, std::vector({0, 0})); } - size_t bytes_per_scalar = attrib_dtype.elsize(); + size_t bytes_per_scalar = attrib_dtype.itemsize(); if (bytes_per_scalar <= 0) { throw std::runtime_error("Internal PLY loading error. Type has no defined byte size."); }