From f7b08a5e2e69ce5c3fa9cab1c367088e6ae1127a Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Sat, 13 Jun 2020 10:09:36 +0200 Subject: [PATCH] fix snap and appimage u3d --- install/linux/linux_appimages.sh | 2 ++ install/linux/linux_deploy.sh | 2 ++ install/linux/resources/snap/snap_noversion.yaml | 4 +++- snapcraft.yaml | 4 +++- src/meshlab/meshlab.pro | 3 --- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/install/linux/linux_appimages.sh b/install/linux/linux_appimages.sh index f9b205c1d..675f228f3 100644 --- a/install/linux/linux_appimages.sh +++ b/install/linux/linux_appimages.sh @@ -60,6 +60,8 @@ mv readme.txt usr/share/doc/meshlab/ mv lib/libmeshlab-common* usr/lib/ mv plugins/ usr/lib/meshlab/ mv lib/linux/* usr/lib/meshlab/ +mv usr/lib/meshlab/libIDTF* usr/lib/ +mv usr/lib/meshlab/libIFX* usr/lib/ #chrpath -r ../lib/ usr/lib/meshlab/plugins/*.so mv shaders/ usr/share/meshlab/ diff --git a/install/linux/linux_deploy.sh b/install/linux/linux_deploy.sh index f99407124..fb5f54a10 100644 --- a/install/linux/linux_deploy.sh +++ b/install/linux/linux_deploy.sh @@ -57,6 +57,8 @@ mv readme.txt usr/share/doc/meshlab/ mv lib/libmeshlab-common* usr/lib/ mv plugins/ usr/lib/meshlab/ mv lib/linux/* usr/lib/meshlab/ +mv usr/lib/meshlab/libIDTF* usr/lib/ +mv usr/lib/meshlab/libIFX* usr/lib/ #chrpath -r ../lib/ usr/lib/meshlab/plugins/*.so mv shaders/ usr/share/meshlab/ diff --git a/install/linux/resources/snap/snap_noversion.yaml b/install/linux/resources/snap/snap_noversion.yaml index b859c662e..52cefdf38 100644 --- a/install/linux/resources/snap/snap_noversion.yaml +++ b/install/linux/resources/snap/snap_noversion.yaml @@ -108,5 +108,7 @@ parts: mv readme.txt $SNAPCRAFT_PART_INSTALL/usr/share/doc/meshlab/ mv lib/libmeshlab-common* $SNAPCRAFT_PART_INSTALL/usr/lib/ mv plugins/ $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/ - mv lib/linux/* $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/plugins + mv lib/linux/* $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/ + mv $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/libIDTF* $SNAPCRAFT_PART_INSTALL/usr/lib/ + mv $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/libIFX* $SNAPCRAFT_PART_INSTALL/usr/lib/ mv shaders/ $SNAPCRAFT_PART_INSTALL/usr/share/meshlab/ diff --git a/snapcraft.yaml b/snapcraft.yaml index 608ed51b3..4a737fa69 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -108,5 +108,7 @@ parts: mv readme.txt $SNAPCRAFT_PART_INSTALL/usr/share/doc/meshlab/ mv lib/libmeshlab-common* $SNAPCRAFT_PART_INSTALL/usr/lib/ mv plugins/ $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/ - mv lib/linux/* $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/plugins + mv lib/linux/* $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/ + mv $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/libIDTF* $SNAPCRAFT_PART_INSTALL/usr/lib/ + mv $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/libIFX* $SNAPCRAFT_PART_INSTALL/usr/lib/ mv shaders/ $SNAPCRAFT_PART_INSTALL/usr/share/meshlab/ diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro index 3a1eba280..6ef89f84a 100644 --- a/src/meshlab/meshlab.pro +++ b/src/meshlab/meshlab.pro @@ -134,9 +134,6 @@ linux:LIBS += \ -lmeshlab-common -lGLU \ -L$$MESHLAB_DISTRIB_DIRECTORY/lib/linux -ljhead -#for appimage and snap -linux:QMAKE_LFLAGS += -Wl,-rpath=../lib/meshlab/ - !CONFIG(system_glew) { INCLUDEPATH *= $$GLEWDIR/include }