From 6b1fab13b95b8e94e5e51ffbc7e7d222ad4cd97a Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Fri, 30 Oct 2020 08:49:41 +0100 Subject: [PATCH] Fixes and boost 1.72 --- .github/workflows/demo.yml | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml index b3221a1b41c..8b4b31f270b 100644 --- a/.github/workflows/demo.yml +++ b/.github/workflows/demo.yml @@ -9,7 +9,11 @@ jobs: - uses: actions/checkout@v2.0.0 - name: install dependencies run: | - sudo apt-get install -y libboost-dev libboost-program-options-dev libmpfr-dev libeigen3-dev qtbase5-dev libqt5sql5-sqlite libqt5opengl5-dev qtscript5-dev libqt5svg5-dev qttools5-dev qttools5-dev-tools + sudo add-apt-repository ppa:mikhailnov/pulseeffects -y + sudo apt-get update + sudo apt-get install -y libmpfr-dev \ + libeigen3-dev qtbase5-dev libqt5sql5-sqlite libqt5opengl5-dev qtscript5-dev \ + libqt5svg5-dev qttools5-dev qttools5-dev-tools libboost1.72-dev git clone --branch v3.18.4 --depth 1 git://github.com/Kitware/CMake.git cd ./CMake mkdir build @@ -23,7 +27,7 @@ jobs: run: | set -ex cd Polyhedron/demo - LIST_OF_PLUGINS=$(for f in $(find ./Polyhedron/Plugins -iname "CMakeLists.txt"); do egrep "polyhedron_demo_plugin" $f |cut -d\( -f2 | cut -d" " -f1|sort -u|egrev -v "partition_plugin" ||true; done) + LIST_OF_PLUGINS=$(for f in $(find ./Polyhedron/Plugins -iname "CMakeLists.txt" |egrep -v Three_examples); do egrep "polyhedron_demo_plugin" $f |cut -d\( -f2 | cut -d" " -f1|sort -u|egrep -v "partition_plugin" |egrep -v "basic_item_plugin"|egrep -v ||true; done) PLUGINS_ARRAY=(${LIST_OF_PLUGINS}); NB_OF_PLUGINS=${#PLUGINS_ARRAY[@]} DEL=$(($NB_OF_PLUGINS / 4)) @@ -37,7 +41,11 @@ jobs: - uses: actions/checkout@v2.0.0 - name: install dependencies run: | - sudo apt-get install -y libboost-dev libboost-program-options-dev libmpfr-dev libeigen3-dev qtbase5-dev libqt5sql5-sqlite libqt5opengl5-dev qtscript5-dev libqt5svg5-dev qttools5-dev qttools5-dev-tools + sudo add-apt-repository ppa:mikhailnov/pulseeffects -y + sudo apt-get update + sudo apt-get install -y libmpfr-dev \ + libeigen3-dev qtbase5-dev libqt5sql5-sqlite libqt5opengl5-dev qtscript5-dev \ + libqt5svg5-dev qttools5-dev qttools5-dev-tools libboost1.72-dev git clone --branch v3.18.4 --depth 1 git://github.com/Kitware/CMake.git cd ./CMake mkdir build @@ -51,7 +59,7 @@ jobs: run: | set -ex cd Polyhedron/demo - LIST_OF_PLUGINS=$(for f in $(find ./Polyhedron/Plugins -iname "CMakeLists.txt"); do egrep "polyhedron_demo_plugin" $f |cut -d\( -f2 | cut -d" " -f1|sort -u|egrev -v "vtk_plugin"; done) + LIST_OF_PLUGINS=$(for f in $(find ./Polyhedron/Plugins -iname "CMakeLists.txt" |egrep -v Three_examples); do egrep "polyhedron_demo_plugin" $f |cut -d\( -f2 | cut -d" " -f1|sort -u|egrep -v "vtk_plugin"; done) PLUGINS_ARRAY=(${LIST_OF_PLUGINS}); NB_OF_PLUGINS=${#PLUGINS_ARRAY[@]} DEL=$(($NB_OF_PLUGINS / 4)) @@ -65,7 +73,11 @@ jobs: - uses: actions/checkout@v2.0.0 - name: install dependencies run: | - sudo apt-get install -y libboost-dev libboost-program-options-dev libmpfr-dev libeigen3-dev qtbase5-dev libqt5sql5-sqlite libqt5opengl5-dev qtscript5-dev libqt5svg5-dev qttools5-dev qttools5-dev-tools + sudo add-apt-repository ppa:mikhailnov/pulseeffects -y + sudo apt-get update + sudo apt-get install -y libmpfr-dev \ + libeigen3-dev qtbase5-dev libqt5sql5-sqlite libqt5opengl5-dev qtscript5-dev \ + libqt5svg5-dev qttools5-dev qttools5-dev-tools libboost1.72-dev git clone --branch v3.18.4 --depth 1 git://github.com/Kitware/CMake.git cd ./CMake mkdir build @@ -79,7 +91,7 @@ jobs: run: | set -ex cd Polyhedron/demo - LIST_OF_PLUGINS=$(for f in $(find ./Polyhedron/Plugins -iname "CMakeLists.txt"); do egrep "polyhedron_demo_plugin" $f |cut -d\( -f2 | cut -d" " -f1|sort -u |egrep -v "register_point_sets_plugin"; done) + LIST_OF_PLUGINS=$(for f in $(find ./Polyhedron/Plugins -iname "CMakeLists.txt" |egrep -v Three_examples); do egrep "polyhedron_demo_plugin" $f |cut -d\( -f2 | cut -d" " -f1|sort -u|egrep -v "register_point_sets_plugin"| egrep -v "classification_plugin" | egrep -v "io_image_plugin" ||true; done) PLUGINS_ARRAY=(${LIST_OF_PLUGINS}); NB_OF_PLUGINS=${#PLUGINS_ARRAY[@]} DEL=$(($NB_OF_PLUGINS / 4)) @@ -93,7 +105,11 @@ jobs: - uses: actions/checkout@v2.0.0 - name: install dependencies run: | - sudo apt-get install -y libboost-dev libboost-program-options-dev libmpfr-dev libeigen3-dev qtbase5-dev libqt5sql5-sqlite libqt5opengl5-dev qtscript5-dev libqt5svg5-dev qttools5-dev qttools5-dev-tools + sudo add-apt-repository ppa:mikhailnov/pulseeffects -y + sudo apt-get update + sudo apt-get install -y libmpfr-dev \ + libeigen3-dev qtbase5-dev libqt5sql5-sqlite libqt5opengl5-dev qtscript5-dev \ + libqt5svg5-dev qttools5-dev qttools5-dev-tools libboost1.72-dev git clone --branch v3.18.4 --depth 1 git://github.com/Kitware/CMake.git cd ./CMake mkdir build @@ -107,7 +123,7 @@ jobs: run: | set -ex cd Polyhedron/demo - LIST_OF_PLUGINS=$(for f in $(find ./Polyhedron/Plugins -iname "CMakeLists.txt"); do egrep "polyhedron_demo_plugin" $f |cut -d\( -f2 | cut -d" " -f1|sort -u; done) + LIST_OF_PLUGINS=$(for f in $(find ./Polyhedron/Plugins -iname "CMakeLists.txt" |egrep -v Three_examples); do egrep "polyhedron_demo_plugin" $f |cut -d\( -f2 | cut -d" " -f1|sort -u|egrep -v "register_point_sets_plugin"|egrep -v "classification_plugin"| egrep -v "io_image_plugin" ||true ; done) PLUGINS_ARRAY=(${LIST_OF_PLUGINS}); NB_OF_PLUGINS=${#PLUGINS_ARRAY[@]} DEL=$(($NB_OF_PLUGINS / 4))