using bundled xerces

This commit is contained in:
alemuntoni 2021-07-29 14:34:08 +02:00
parent aea3e1ef5d
commit 3327cebb9b
5 changed files with 6 additions and 42 deletions

View File

@ -46,7 +46,7 @@ jobs:
uses: jurplel/install-qt-action@v2
- name: Install dependencies
run: |
sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libgmp-dev libcgal-dev libboost-all-dev libxerces-c-dev
sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libgmp-dev libcgal-dev libboost-all-dev
#needed by qt 5.15 on linux
sudo apt-get install libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-render-util0-dev libxcb-xinerama0-dev
- name: Setup env variables

View File

@ -19,7 +19,7 @@ jobs:
uses: jurplel/install-qt-action@v2
- name: Install dependencies
run: |
sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libgmp-dev libcgal-dev libboost-all-dev libxerces-c-dev
sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libgmp-dev libcgal-dev libboost-all-dev
#needed by qt 5.15 on linux
sudo apt-get install libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-render-util0-dev libxcb-xinerama0-dev
- name: Setup env variables

View File

@ -1,35 +0,0 @@
name: LinuxSnap
on:
workflow_dispatch
jobs:
linux_build_snap:
name: Build MeshLab (Linux - Snap)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
submodules: true
- name: Install dependencies
run: |
#needed for some reason...
curl https://bazel.build/bazel-release.pub.gpg | sudo apt-key add -
sudo apt update
sudo apt-get install -y snapcraft
- name: Setup env variables
id: envs
run: |
echo ::set-output name=date::"$(cat ML_VERSION)"
- name: Build MeshLab Snap
run: |
snapcraft
- name: Rename Snap
run: |
mv ./meshlab*.snap ./MeshLab${{steps.envs.outputs.date}}-linux.snap
- name: Upload Meshlab Snap
uses: actions/upload-artifact@v1
with:
name: meshlab_linux_snap
path: MeshLab${{steps.envs.outputs.date}}-linux.snap

View File

@ -4,7 +4,7 @@
#
# Run this script if you never installed any of the MeshLab dependencies.
sudo apt-get update
sudo apt-get update
sudo apt-get install -y qt5-default qttools5-dev-tools qtdeclarative5-dev
sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libglew-dev lib3ds-dev libeigen3-dev
sudo apt-get install -y libopenctm-dev libgmp-dev libqhull-dev libcgal-dev libboost-all-dev patchelf cmake
sudo apt-get install -y mesa-common-dev libglu1-mesa-dev
sudo apt-get install -y libgmp-devlibcgal-dev libboost-all-dev patchelf cmake

View File

@ -35,8 +35,7 @@ $SCRIPTS_PATH/resources/linuxdeployqt $INSTALL_PATH/usr/share/applications/meshl
-executable=$INSTALL_PATH/usr/lib/meshlab/plugins/libfilter_sketchfab.so \
-executable=$INSTALL_PATH/usr/lib/meshlab/plugins/libio_3ds.so \
-executable=$INSTALL_PATH/usr/lib/meshlab/plugins/libio_ctm.so \
-executable=$INSTALL_PATH/usr/lib/meshlab/plugins/libfilter_mesh_booleans.so \
-executable=$INSTALL_PATH/usr/lib/meshlab/plugins/libio_e57.so
-executable=$INSTALL_PATH/usr/lib/meshlab/plugins/libfilter_mesh_booleans.so
chmod +x $INSTALL_PATH/usr/bin/meshlab