commit 67f3ed1e2785e05efd283f140769972eacc0e424
parent 0f882001d4232e7adee2a901b58eebdc7714385a
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date: Wed, 10 Apr 2024 15:04:22 +0200
Merge branch 'release_0.4'
Diffstat:
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
@@ -21,6 +21,10 @@ project from the `cmake/CMakeLists.txt` file by appending to the
## Release notes
+### Version 0.4
+
+- Upgrade to gmsh 4.12.2
+
### Version 0.3.1
- Add a flag allowing to dump overlapping geometries
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -23,7 +23,7 @@ option(NO_TEST "Disable the test" OFF)
################################################################################
# Check dependencies
################################################################################
-find_package(gmsh 4.9.5 REQUIRED)
+find_package(gmsh 4.12.2 REQUIRED)
find_package(RCMake 0.4.1 REQUIRED)
find_package(RSys 0.12.1 REQUIRED)
find_package(StarGeom3D 0.1.3 REQUIRED)
@@ -43,8 +43,8 @@ include_directories(
# Configure and define targets
################################################################################
set(VERSION_MAJOR 0)
-set(VERSION_MINOR 3)
-set(VERSION_PATCH 1)
+set(VERSION_MINOR 4)
+set(VERSION_PATCH 0)
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
set(SCAD_FILES_SRC
diff --git a/src/scad_geometry.c b/src/scad_geometry.c
@@ -649,7 +649,8 @@ scad_add_disk
ERR(check_device(FUNC_NAME));
allocator = dev->allocator;
- gmsh_ID = gmshModelOccAddDisk(SPLIT3(xyz), radius, radius, -1, &ierr);
+ gmsh_ID = gmshModelOccAddDisk(SPLIT3(xyz), radius, radius, -1, NULL, 0,
+ NULL, 0, &ierr);
ERR(gmsh_err_to_res_T(ierr));
ERR(geometry_create(name, &geom));