From f0e5874d4922e918d9d033ec8ccc15e9aa4ea35b Mon Sep 17 00:00:00 2001 From: Paolo Cignoni Date: Tue, 20 Feb 2018 23:29:36 +0100 Subject: [PATCH] removing some plugins from full appveyor pro --- .travis.yml | 9 ++-- appveyor.yml | 2 +- src/meshlab_full_appveyor.pro | 81 +++++++++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+), 5 deletions(-) create mode 100644 src/meshlab_full_appveyor.pro diff --git a/.travis.yml b/.travis.yml index f3e7e7671..350342095 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,8 +20,7 @@ git: # fi install: - - | - if [[ "$TRAVIS_OS_NAME" == "osx" ]] + - if [[ "$TRAVIS_OS_NAME" == "osx" ]] then brew update > /dev/null brew install llvm @@ -29,9 +28,11 @@ install: brew install qt5 export QTDIR="/usr/local/opt/qt5" fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]] + - if [[ "$TRAVIS_OS_NAME" == "linux" ]] then sudo apt-get -y install qt5-default + sudo apt-get -y install libqt5script5 + sudo apt-get -y install libqt5xmlpatterns5 qmake --version fi - cd .. @@ -49,7 +50,7 @@ script: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH="$QTDIR/bin:$PATH" ;fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then LDFLAGS=-L$QTDIR/lib ;fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then CPPFLAGS=-I$QTDIR/include ;fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then source /opt/qt55/bin/qt55-env.sh ;fi + #- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then source /opt/qt55/bin/qt55-env.sh ;fi - cd src - cd external - qmake --version diff --git a/appveyor.yml b/appveyor.yml index fab47e122..7658aeee9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -69,7 +69,7 @@ build_script: - dir # Run qmake for the REAL project # - qmake meshlab_mini.pro -r -spec %SPEC% "CONFIG+=%CONFIGURATION%" - - qmake meshlab_full.pro -r + - qmake meshlab_full_appveyor.pro -r - dir # Run compiler #- '%COMPILER%' diff --git a/src/meshlab_full_appveyor.pro b/src/meshlab_full_appveyor.pro new file mode 100644 index 000000000..13dc7d15f --- /dev/null +++ b/src/meshlab_full_appveyor.pro @@ -0,0 +1,81 @@ +#config += debug_and_release +TEMPLATE = subdirs +CONFIG += ordered +SUBDIRS = common \ + meshlab \ + meshlabserver \ +# IO plugins +# meshlabplugins/io_3ds\ + meshlabplugins/io_base\ + meshlabplugins/io_bre \ + meshlabplugins/io_collada \ + meshlabplugins/io_ctm \ + meshlabplugins/io_expe \ + meshlabplugins/io_json \ + meshlabplugins/io_tri\ + meshlabplugins/io_x3d \ + meshlabplugins/io_pdb \ + meshlabplugins/io_txt \ + meshlabplugins/io_u3d\ +# Filter plugins + meshlabplugins/filter_aging \ + meshlabplugins/filter_ao \ + meshlabplugins/filter_bnpts \ + meshlabplugins/filter_camera \ + meshlabplugins/filter_clean \ + meshlabplugins/filter_color_projection \ + meshlabplugins/filter_colorize \ + meshlabplugins/filter_colorproc \ + meshlabplugins/filter_create \ + meshlabplugins/filter_csg \ + meshlabplugins/filter_dirt \ + meshlabplugins/filter_fractal \ + meshlabplugins/filter_func \ + meshlabplugins/filter_img_patch_param \ + meshlabplugins/filter_isoparametrization \ + meshlabplugins/filter_layer \ + meshlabplugins/filter_measure \ + meshlabplugins/filter_meshing \ + meshlabplugins/filter_mls \ + meshlabplugins/filter_mutualglobal \ + meshlabplugins/filter_mutualinfoxml \ + meshlabplugins/filter_plymc \ + meshlabplugins/filter_qhull \ + meshlabplugins/filter_quality \ + meshlabplugins/filter_sampling \ + meshlabplugins/filter_screened_poisson \ + meshlabplugins/filter_sdfgpu \ + meshlabplugins/filter_select \ + meshlabplugins/filter_sketchfab \ + meshlabplugins/filter_ssynth \ + meshlabplugins/filter_texture \ + meshlabplugins/filter_trioptimize \ + meshlabplugins/filter_unsharp \ + meshlabplugins/filter_voronoi \ +# Rendering and Decoration Plugins + meshlabplugins/render_gdp \ + meshlabplugins/render_radiance_scaling \ + meshlabplugins/decorate_base \ + meshlabplugins/decorate_background \ + meshlabplugins/decorate_raster_proj \ + meshlabplugins/decorate_shadow \ +# Edit Plugins + meshlabplugins/edit_align \ + meshlabplugins/edit_manipulators \ + meshlabplugins/edit_measure \ + meshlabplugins/edit_mutualcorrs \ + meshlabplugins/edit_paint\ + meshlabplugins/edit_pickpoints \ + meshlabplugins/edit_point\ + meshlabplugins/edit_referencing \ + meshlabplugins/edit_quality \ + meshlabplugins/edit_select \ +# Sample Plugins + sampleplugins/sampleedit \ + sampleplugins/samplefilter \ + sampleplugins/samplefilterdyn \ + sampleplugins/filter_createiso \ + sampleplugins/filter_geodesic \ + sampleplugins/sample_filtergpu \ + +