Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()


Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion src/common/ply_loader.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ pybind11::array ply_data_to_array(std::shared_ptr<tinyply::PlyData> attrib) {
if (attrib->count == 0) {
return pybind11::array(attrib_dtype, std::vector<size_t>({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.");
}
Expand Down