diff --git a/README.md b/README.md index c5ab1c31a..272c2d5fc 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ MeshLab is available for Windows, MacOSX, and Linux. # Build instructions -MeshLab requires [Qt](https://www.qt.io/) >= 5.9, with "script" and "xmlpatterns" as additional packages. +MeshLab requires [Qt](https://www.qt.io/) >= 5.9, with `script` and `xmlpatterns` as additional packages. After setting up the Qt environment: @@ -23,8 +23,31 @@ After setting up the Qt environment: cd src qmake make + +Then, a meshlab executable can be found inside the `distrib` folder. -Compiling instructions can be found in the [src](https://github.com/cnr-isti-vclab/meshlab/tree/master/src) folder or simply looking at the continous integration setup on [Github Actions](https://github.com/cnr-isti-vclab/meshlab/actions), [travis](https://travis-ci.org/cnr-isti-vclab/meshlab/builds) and [appveyor](https://ci.appveyor.com/project/cignoni/meshlab/history). +You can also use [QtCreator](https://www.qt.io/product) to build meshlab: + +1. Install QtCreator and Qt >= 5.9 with `script` and `xmlpatterns` as additional packages; +2. Open `meshlab.pro` inside `src`; +3. Select your favourite shadow build directory; +4. Before the build, deactive the `QtQuickCompiler` option from the qmake call in the project options; +5. Build meshlab. + +A compilation with `cmake` is also supported. + +We provide a set of scripts that allows to compile and deploy meshlab for every platform. You can find these scripts in the `install` folder. + +# Structure of the Repository + +The MeshLab repository is organized as follows: + +* `distrib` +* `docs` +* `install` +* `sample` +* `src` +* `vcglib` # License diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml deleted file mode 100644 index fb6b3a0cc..000000000 --- a/snap/snapcraft.yaml +++ /dev/null @@ -1,65 +0,0 @@ -# Known to build in Ubuntu 17.04 -name: meshlab -version: '2017.03-1' -summary: MeshLab -description: | - The open source system for processing and editing 3D triangular meshes. - It provides a set of tools for editing, cleaning, healing, inspecting, - rendering, texturing and converting meshes. It offers features for processing - raw data produced by 3D digitization tools/devices and for preparing models - for 3D printing. -icon: snap/gui/meshlab.png - -grade: stable -confinement: devmode - -#apps: -# meshlab: -# command: desktop-launch meshlab -# plugs: [home, x11, mir, opengl, unity7] -# meshlabserver: -# command: desktop-launch meshlabserver -# plugs: [home, x11, opengl] - -parts: - meshlab: - after: [desktop-qt5,vcglib] - plugin: qmake - qt-version: qt5 - source: https://github.com/cnr-isti-vclab/meshlab.git - build-packages: - - libqt5opengl5-dev - - libqt5xmlpatterns5-dev - - qt5-default - - qtscript5-dev - prepare: | - ln -sf ../vcglib/install ../vcglib - sed -i '/filter_csg/d' src/meshlab_full.pro - sed -i -e '2ilinux:QMAKE_LFLAGS += -fopenmp -lgomp\' src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.pro - sed -i 's|PR_XXXXXX|/tmp/PR_XXXXXX|' src/meshlabplugins/filter_screened_poisson/Src/Geometry.cpp - build: | - cd src/external - qmake external.pro - make -j4 - cd .. - qmake meshlab_full.pro - make -j4 - install: | - cp src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.xml \ - src/meshlabplugins/filter_mutualinfoxml/filter_mutualinfo.xml \ - src/meshlabplugins/filter_measure/filter_measure.xml \ - src/distrib/plugins/ - cd src/distrib - mkdir -p $SNAPCRAFT_PART_INSTALL/bin - cp -a meshlab* plugins shaders textures $SNAPCRAFT_PART_INSTALL/bin - mkdir -p $SNAPCRAFT_PART_INSTALL/lib - cp -a lib* $SNAPCRAFT_PART_INSTALL/lib - vcglib: - plugin: dump -# source: https://github.com/cnr-isti-vclab/vcglib.git -# source-tag: v1.0.2 - source: https://github.com/cnr-isti-vclab/vcglib.git - source-branch: devel - - -vcglib/apps - prime: [ -* ] -