From c2683ae47f90b7160f31042a145f624940b019fb Mon Sep 17 00:00:00 2001 From: Emmett Lalish Date: Wed, 14 May 2025 22:43:32 +1200 Subject: [PATCH 1/2] bump version --- CMakeLists.txt | 4 ++-- bindings/wasm/package.json | 2 +- flake.nix | 2 +- pyproject.toml | 2 +- scripts/test-cmake.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index df6a3be07..639f7350f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,8 +29,8 @@ include(CMakeDependentOption) # Define Manifold version set(MANIFOLD_VERSION_MAJOR 3) -set(MANIFOLD_VERSION_MINOR 0) -set(MANIFOLD_VERSION_PATCH 1) +set(MANIFOLD_VERSION_MINOR 1) +set(MANIFOLD_VERSION_PATCH 0) set( MANIFOLD_VERSION "${MANIFOLD_VERSION_MAJOR}.${MANIFOLD_VERSION_MINOR}.${MANIFOLD_VERSION_PATCH}" diff --git a/bindings/wasm/package.json b/bindings/wasm/package.json index c1b3211c1..ebd5b7e47 100644 --- a/bindings/wasm/package.json +++ b/bindings/wasm/package.json @@ -1,6 +1,6 @@ { "name": "manifold-3d", - "version": "3.0.1", + "version": "3.1.0", "description": "Geometry library for topological robustness", "main": "manifold.js", "scripts": { diff --git a/flake.nix b/flake.nix index 6e0905d9b..591767c4b 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,7 @@ flake-utils.lib.eachDefaultSystem (system: let - manifold-version = "3.0.1"; + manifold-version = "3.1.0"; pkgs = import nixpkgs { inherit system; overlays = [ diff --git a/pyproject.toml b/pyproject.toml index 0a586a60e..a1a349960 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "manifold3d" -version = "3.0.1" +version = "3.1.0" authors = [ { name="Emmett Lalish", email="elalish@gmail.com" }, ] diff --git a/scripts/test-cmake.sh b/scripts/test-cmake.sh index 18ffb4c14..d0b5c801d 100755 --- a/scripts/test-cmake.sh +++ b/scripts/test-cmake.sh @@ -5,7 +5,7 @@ cd cmake-consumer cat < CMakeLists.txt cmake_minimum_required(VERSION 3.18) project(testing LANGUAGES CXX) -find_package(manifold "3.0.1" REQUIRED) +find_package(manifold "3.1.0" REQUIRED) add_executable(testing test.cpp) target_link_libraries(testing PRIVATE manifold::manifold) EOT From 0139d98641d0f91bd5a91eb93796c096f576fea1 Mon Sep 17 00:00:00 2001 From: pca006132 Date: Wed, 14 May 2025 19:05:56 +0800 Subject: [PATCH 2/2] bindings: include string in manifold3d --- bindings/python/manifold3d.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/bindings/python/manifold3d.cpp b/bindings/python/manifold3d.cpp index f561f6549..8f54fef66 100644 --- a/bindings/python/manifold3d.cpp +++ b/bindings/python/manifold3d.cpp @@ -13,6 +13,7 @@ // limitations under the License. #include +#include #include "autogen_docstrings.inl" // generated in build folder #include "manifold/cross_section.h"