From a8c92fb184f3e96d8c8fe0d44ccef68d96adab2f Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Mon, 25 May 2020 16:02:58 +0200 Subject: [PATCH 1/4] fix qmake config when building from root repo dir --- .github/workflows/CompileUbuntu.yml | 4 +++- src/meshlab.pro | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CompileUbuntu.yml b/.github/workflows/CompileUbuntu.yml index 502bcb0c8..333038462 100755 --- a/.github/workflows/CompileUbuntu.yml +++ b/.github/workflows/CompileUbuntu.yml @@ -30,7 +30,9 @@ jobs: echo ::set-output name=date::"$(cat ML_VERSION)" - name: Build MeshLab run: | - sh install/linux/linux_build.sh + #sh install/linux/linux_build.sh + qmake src/meshlab.pro + make -j4 - name: Deploy MeshLab and MeshLabServer run : | sh install/linux/linux_appimages.sh diff --git a/src/meshlab.pro b/src/meshlab.pro index 4074cc344..91410a7fc 100644 --- a/src/meshlab.pro +++ b/src/meshlab.pro @@ -276,8 +276,7 @@ edit_pickpoints.depends = common # if distrib folder is not in $$PWD/../distrib (shadow build case), # we need to copy all the files inside $$PWD/../distrib in the actual # distrib folder ($$OUT_PWD/distrib or $$MESHLAB_DISTRIB_DIRECTORY) -!equals(PWD, $$OUT_PWD) { - +!equals(PWD, $$OUT_PWD) : !equals(PWD, $$OUT_PWD/..) { #copying the "lib" folder inside the $$OUT_PWD/distrib win32:copydir.commands = $(COPY_DIR) \"$$shell_path($$PWD/../distrib)\" \"$$shell_path($$OUT_PWD/distrib)\" !win32:copydir.commands = $(COPY_DIR) \"$$shell_path($$PWD/../distrib)\" \"$$shell_path($$OUT_PWD)\" From 2213f8ccd057333e0925c3abc68330a152ec7892 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Mon, 25 May 2020 16:11:02 +0200 Subject: [PATCH 2/4] tmp --- src/meshlab.pro | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/meshlab.pro b/src/meshlab.pro index 91410a7fc..762354a5a 100644 --- a/src/meshlab.pro +++ b/src/meshlab.pro @@ -277,6 +277,8 @@ edit_pickpoints.depends = common # we need to copy all the files inside $$PWD/../distrib in the actual # distrib folder ($$OUT_PWD/distrib or $$MESHLAB_DISTRIB_DIRECTORY) !equals(PWD, $$OUT_PWD) : !equals(PWD, $$OUT_PWD/..) { + message("PWD: $$PWD") + message("OUT_PWD: $$OUT_PWD") #copying the "lib" folder inside the $$OUT_PWD/distrib win32:copydir.commands = $(COPY_DIR) \"$$shell_path($$PWD/../distrib)\" \"$$shell_path($$OUT_PWD/distrib)\" !win32:copydir.commands = $(COPY_DIR) \"$$shell_path($$PWD/../distrib)\" \"$$shell_path($$OUT_PWD)\" From a38bace5736aad4c152b7eaef7bc62b286fe35ca Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Mon, 25 May 2020 16:14:10 +0200 Subject: [PATCH 3/4] fix qmake bug --- src/meshlab.pro | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/meshlab.pro b/src/meshlab.pro index 762354a5a..89e55aaa7 100644 --- a/src/meshlab.pro +++ b/src/meshlab.pro @@ -276,9 +276,7 @@ edit_pickpoints.depends = common # if distrib folder is not in $$PWD/../distrib (shadow build case), # we need to copy all the files inside $$PWD/../distrib in the actual # distrib folder ($$OUT_PWD/distrib or $$MESHLAB_DISTRIB_DIRECTORY) -!equals(PWD, $$OUT_PWD) : !equals(PWD, $$OUT_PWD/..) { - message("PWD: $$PWD") - message("OUT_PWD: $$OUT_PWD") +!equals(PWD, $$OUT_PWD) : !equals(PWD, $$OUT_PWD/src) { #copying the "lib" folder inside the $$OUT_PWD/distrib win32:copydir.commands = $(COPY_DIR) \"$$shell_path($$PWD/../distrib)\" \"$$shell_path($$OUT_PWD/distrib)\" !win32:copydir.commands = $(COPY_DIR) \"$$shell_path($$PWD/../distrib)\" \"$$shell_path($$OUT_PWD)\" From 9c7db341536f5c5a664cbdd7014cf505cd5813a0 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Mon, 25 May 2020 16:16:34 +0200 Subject: [PATCH 4/4] restoring ubuntu build workflow --- .github/workflows/CompileUbuntu.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/CompileUbuntu.yml b/.github/workflows/CompileUbuntu.yml index 333038462..502bcb0c8 100755 --- a/.github/workflows/CompileUbuntu.yml +++ b/.github/workflows/CompileUbuntu.yml @@ -30,9 +30,7 @@ jobs: echo ::set-output name=date::"$(cat ML_VERSION)" - name: Build MeshLab run: | - #sh install/linux/linux_build.sh - qmake src/meshlab.pro - make -j4 + sh install/linux/linux_build.sh - name: Deploy MeshLab and MeshLabServer run : | sh install/linux/linux_appimages.sh