external automatically compiled by meshlab and rules to manage shadow build

This commit is contained in:
alemuntoni 2020-01-21 16:41:10 +01:00
parent 253423567d
commit 5855bd528c
6 changed files with 25 additions and 32 deletions

View File

@ -22,11 +22,6 @@ jobs:
shell: bash
run: |
echo ::set-output name=date::"$(date +%Y.%m)"
- name: Compiling external
run: |
cd src/external
qmake external.pro
make -j4
- name: Compiling MeshLab
run: |
cd src/
@ -70,11 +65,6 @@ jobs:
echo '::set-env name=LD_LIBRARY_PATH::/usr/local/opt/qt/lib:${{env.LD_LIBRARY_PATH}}'
echo '::set-env name=PKG_CONFIG_PATH::/usr/local/opt/qt/lib:${{env.PKG_CONFIG_PATH}}'
echo ::set-output name=date::"$(date +%Y.%m)"
- name: Compiling external
run: |
cd src/external
qmake external.pro
make -j4
- name: Compiling MeshLab
run: |
cd src/
@ -109,11 +99,6 @@ jobs:
run: |
cd ..
git clone --depth=1 --branch=devel https://github.com/cnr-isti-vclab/vcglib.git
- name: Compiling external
run: |
cd src\external
qmake external.pro -r
nmake
- name: Compiling MeshLab
run: |
cd src\

View File

@ -25,11 +25,6 @@ jobs:
echo '::set-env name=LD_LIBRARY_PATH::/usr/local/opt/qt/lib:${{env.LD_LIBRARY_PATH}}'
echo '::set-env name=PKG_CONFIG_PATH::/usr/local/opt/qt/lib:${{env.PKG_CONFIG_PATH}}'
echo ::set-output name=date::"$(date +%Y.%m)"
- name: Compiling external
run: |
cd src/external
qmake external.pro
make -j4
- name: Compiling MeshLab
run: |
cd src/

View File

@ -20,11 +20,6 @@ jobs:
shell: bash
run: |
echo ::set-output name=date::"$(date +%Y.%m)"
- name: Compiling external
run: |
cd src/external
qmake external.pro
make -j4
- name: Compiling MeshLab
run: |
cd src/

View File

@ -19,11 +19,6 @@ jobs:
run: |
cd ..
git clone --depth=1 --branch=devel https://github.com/cnr-isti-vclab/vcglib.git
- name: Compiling external
run: |
cd src\external
qmake external.pro -r
nmake
- name: Compiling MeshLab
run: |
cd src\

View File

@ -1,7 +1,9 @@
#config += debug_and_release
TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS = common \
SUBDIRS = external \
common \
meshlab \
meshlabserver \
# IO plugins
@ -79,3 +81,13 @@ SUBDIRS = common \
sampleplugins/sample_filtergpu \
!equals(PWD, $${OUT_PWD}) {
#copying the "shaders" folder inside the build directory
copydata.commands = $(COPY_DIR) $$PWD/distrib/shaders $$OUT_PWD/distrib
first.depends = $(first) copydata
export(first.depends)
export(copydata.commands)
QMAKE_EXTRA_TARGETS += first copydata
}

View File

@ -10,7 +10,8 @@ CONFIG += ordered
# the common framework, used by all the plugins,
SUBDIRS = common \
SUBDIRS = external \
common \
meshlab \ # the GUI framework
meshlabserver \
meshlabplugins/io_base\ # a few basic file formats (ply, obj, off), without this you cannot open anything
@ -39,3 +40,13 @@ SUBDIRS = common \
# meshlabplugins/io_collada \
# meshlabplugins/io_x3d \
!equals(PWD, $${OUT_PWD}) {
#copying the "shaders" folder inside the build directory
copydata.commands = $(COPY_DIR) $$PWD/distrib/shaders $$OUT_PWD/distrib
first.depends = $(first) copydata
export(first.depends)
export(copydata.commands)
QMAKE_EXTRA_TARGETS += first copydata
}