fixed build script

Fix warning by not calling now-empty and deprecated retain().

See merge request OpenMesh/OpenMesh!352

.gitignore

@@ -16,3 +16,32 @@ debian/stamp*
 debian/.debhelper
 debian/libopenmesh*
 obj-x86_64-linux-gnu
+# Created by https://www.toptal.com/developers/gitignore/api/cmake
+# Edit at https://www.toptal.com/developers/gitignore?templates=cmake
+
+### CMake ###
+CMakeLists.txt.user
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+_deps
+
+### CMake Patch ###
+CMakeUserPresets.json
+
+# External projects
+*-prefix/
+
+# End of https://www.toptal.com/developers/gitignore/api/cmake
+n
+
+build-headers
+build-ios
+build-macos
+build-xcframework

.gitlab-ci.yml

@@ -28,7 +28,6 @@ cppcheck:
   image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
-    - stretch
   timeout: 3h
   artifacts:
     paths:
@@ -47,7 +46,6 @@ build-debug-gcc-cpp11-qt6.1.2:
   #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
-    - stretch
   variables:
     COMPILER: "gcc"
     LANGUAGE: "cpp11"
@@ -71,7 +69,6 @@ test-debug-gcc-cpp11-qt6.1.2:
   #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
-    - stretch
     - MultiThreads
   variables:
     COMPILER: "gcc"
@@ -103,7 +100,6 @@ build-release-gcc-cpp11-qt6.1.2:
   #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
-    - stretch
   variables:
     COMPILER: "gcc"
     LANGUAGE: "cpp11"
@@ -127,7 +123,6 @@ test-release-gcc-cpp11-qt6.1.2:
   #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
-    - stretch
     - MultiThreads
   variables:
     COMPILER: "gcc"
@@ -159,7 +154,6 @@ build-debug-clang-cpp11-qt6.1.2:
   #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
-    - stretch
   variables:
     COMPILER: "clang"
     LANGUAGE: "cpp11"
@@ -183,7 +177,6 @@ test-debug-clang-cpp11-qt6.1.2:
   #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
-    - stretch
     - MultiThreads
   variables:
     COMPILER: "clang"
@@ -215,7 +208,6 @@ build-release-clang-cpp11-qt6.1.2:
   #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
-    - stretch
   variables:
     COMPILER: "clang"
     LANGUAGE: "cpp11"
@@ -239,7 +231,6 @@ test-release-clang-cpp11-qt6.1.2:
   #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
-    - stretch
     - MultiThreads
   variables:
     COMPILER: "clang"
@@ -272,7 +263,6 @@ build-debug-gcc-cpp14-qt5.15.1:
   #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
-    - stretch
   variables:
     COMPILER: "gcc"
     LANGUAGE: "cpp14"
@@ -296,7 +286,6 @@ test-debug-gcc-cpp14-qt5.15.1:
   #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
-    - stretch
     - MultiThreads
   variables:
     COMPILER: "gcc"
@@ -328,7 +317,6 @@ build-release-gcc-cpp14-qt5.15.1:
   #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
-    - stretch
   variables:
     COMPILER: "gcc"
     LANGUAGE: "cpp14"
@@ -352,7 +340,6 @@ test-release-gcc-cpp14-qt5.15.1:
   #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
-    - stretch
     - MultiThreads
   variables:
     COMPILER: "gcc"
@@ -384,7 +371,6 @@ build-debug-clang-cpp14-qt5.15.1:
   #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
-    - stretch
   variables:
     COMPILER: "clang"
     LANGUAGE: "cpp14"
@@ -408,7 +394,6 @@ test-debug-clang-cpp14-qt5.15.1:
   #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
-    - stretch
     - MultiThreads
   variables:
     COMPILER: "clang"
@@ -440,7 +425,6 @@ build-release-clang-cpp14-qt5.15.1:
   #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
-    - stretch
   variables:
     COMPILER: "clang"
     LANGUAGE: "cpp14"
@@ -464,7 +448,6 @@ test-release-clang-cpp14-qt5.15.1:
   #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
-    - stretch
     - MultiThreads
   variables:
     COMPILER: "clang"
@@ -732,7 +715,6 @@ Sources:
   script: "CI/ci-source.sh"
   tags:
      - Linux
-     - stretch     
   dependencies: []
   artifacts:
     paths:

CI/Windows.bat

@@ -176,7 +176,7 @@ del *.exe
 
 IF %errorlevel% NEQ 0 exit /b %errorlevel%
 
-move OpenMesh-*.exe "OpenMesh-10.0-Git-Master-%BUILD_PLATFORM%-%STRING_ARCH%%STRING_DLL%%STRING_APPS%.exe"
+move OpenMesh-*.exe "OpenMesh-11.0-Git-Master-%BUILD_PLATFORM%-%STRING_ARCH%%STRING_DLL%%STRING_APPS%.exe"
 
 
 

CI/gitlab-ci/ci-master.yml

@@ -29,7 +29,6 @@ Sources:
   script: "CI/ci-source.sh"
   tags:
      - Linux
-     - stretch     
   dependencies: []
   artifacts:
     paths:

CI/gitlab-ci/linux-iwyu-job.yml

@@ -10,7 +10,6 @@ iwyu-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}:
   image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
-    - stretch
   variables:
     COMPILER: "{{COMPILER}}"
     LANGUAGE: "{{LANGUAGE}}"

CI/gitlab-ci/linux-template-build-job.yml

@@ -11,7 +11,6 @@ build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}:
   #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
-    - stretch
   variables:
     COMPILER: "{{COMPILER}}"
     LANGUAGE: "{{LANGUAGE}}"

CI/gitlab-ci/linux-template-test-job.yml

@@ -10,7 +10,6 @@ test-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}:
   #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
-    - stretch
     - MultiThreads
   variables:
     COMPILER: "{{COMPILER}}"

CI/gitlab-ci/linux.yml

@@ -8,7 +8,6 @@ cppcheck:
   image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
-    - stretch
   timeout: 3h
   artifacts:
     paths:

Doc/compiling.docu

@@ -35,6 +35,12 @@ Install the following external libraries / frameworks if you want to use the inc
 <tr><td>Qt5</td><td><a href="http://qt-project.org/downloads" target="_blank">https://www.qt.io/download</a></td></tr>
 </table><br>
 
+\section download_source Getting the source code
+You can download one of the source packages provided at our website: <a href="https://www.graphics.rwth-aachen.de/software/openmesh/download/" target="_blank">OpenMesh.org</a><br>
+<br>
+Or to get the latest version you can clone the repository using git. Make sure to clone recursively to get all required dependencies:<br>
+git clone --recursive https://gitlab.vci.rwth-aachen.de:9000/OpenMesh/OpenMesh.git
+
 \section build_systems Chosing build system
 
 %OpenMesh can be built using the <b>cmake</b> build system.

README.md

@@ -9,6 +9,10 @@ All Documentation, binaries and original source code are available at www.openme
 The main git repository is available at:  
 https://gitlab.vci.rwth-aachen.de:9000/OpenMesh/OpenMesh.git  
 
+To clone the repository use:
+`git clone --recursive https://gitlab.vci.rwth-aachen.de:9000/OpenMesh/OpenMesh.git`
+
+
 The gitlab site can be found here:  
 https://gitlab.vci.rwth-aachen.de:9000/OpenMesh/OpenMesh  
 

build.sh

@@ -0,0 +1,27 @@
+rm -rf build-macos
+mkdir build-macos && cd build-macos
+cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"  -DCMAKE_OSX_DEPLOYMENT_TARGET=14.0
+ninja
+libtool -static -o Build/lib/libOpenMesh.a Build/lib/libOpenMeshCore.a Build/lib/libOpenMeshTools.a
+cd ..
+
+
+rm -rf build-ios
+mkdir build-ios && cd build-ios
+cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_ARCHITECTURES="arm64"  -DCMAKE_OSX_DEPLOYMENT_TARGET=16.0
+ninja
+libtool -static -o Build/lib/libOpenMesh.a Build/lib/libOpenMeshCore.a Build/lib/libOpenMeshTools.a
+cd ..
+
+rm -rf build-headers
+rsync -av --include='*/' --include='*.hh' --include='*.h' --exclude='*' src/OpenMesh build-headers
+cp module.modulemap build-headers
+
+rm -rf build-xcframework
+mkdir build-xcframework
+
+
+xcodebuild -create-xcframework \
+  -library build-macos/Build/lib/libOpenMesh.a -headers build-headers \
+  -library build-ios/Build/lib/libOpenMesh.a -headers build-headers \
+  -output build-xcframework/openmesh.xcframework

module.modulemap

@@ -0,0 +1,5 @@
+module OpenMesh {
+    umbrella "."
+    export *
+    module * { export * }
+}

release.howto

@@ -6,6 +6,7 @@
    src/OpenMesh/Core/System/config.h
    README
    CMakeLists.txt ( version setting in project call)
+   CI/Windows.bat
 3. Tag the current version in the git 
 4. Create HTML-Documentation in OpenMesh/Documentation (!)
 5. Create tar-ball and zip-archive ( -> Done by CI)

src/OpenMesh/Core/Mesh/PolyConnectivity.cc

@@ -1113,9 +1113,14 @@ void PolyConnectivity::split_edge(EdgeHandle _eh, VertexHandle _vh)
   set_next_halfedge_handle(new_e, h0);
   set_next_halfedge_handle(h1, opposite_halfedge_handle(new_e));
   
-  set_next_halfedge_handle(ph0, new_e);
+  if (ph0 == h1) {
-  set_next_halfedge_handle(opposite_halfedge_handle(new_e), nh1);
+    // valence one vfrom with p(h0) = opp(h0):
-  
+    set_next_halfedge_handle(opposite_halfedge_handle(new_e), new_e);
+  } else {
+    // regular case
+    set_next_halfedge_handle(ph0, new_e);
+    set_next_halfedge_handle(opposite_halfedge_handle(new_e), nh1);
+  }
 //  set_prev_halfedge_handle(new_e, ph0);
 //  set_prev_halfedge_handle(opposite_halfedge_handle(new_e), h1);
   

src/OpenMesh/Core/Utils/PropertyManager.hh

@@ -390,7 +390,6 @@ class PropertyManager {
                 const PROP_VALUE &init_value) {
             const bool exists = propertyExists(mesh, propname);
             PropertyManager pm(mesh, propname, exists);
-            pm.retain();
             if (!exists)
                 pm.set_range(begin, end, init_value);
             return std::move(pm);