songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Manually install libqglviewer.

This commit is contained in:
Maxime Gimeno 2017-02-17 11:05:31 +01:00
parent d40183631b
commit cbb1b3a043
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -79,7 +79,7 @@ addons:
- libqt5gui5 - libqt5gui5
- libqt5widgets5 - libqt5widgets5
- libqt5xml5 - libqt5xml5
- libqglviewer-dev - qt5-qmake
# Not allowed (yet) # Not allowed (yet)
# - geomview # - geomview
# - libglew1.5-dev # - libglew1.5-dev

27
.travis/build_package.sh
View File

@ -53,7 +53,7 @@ do
cd build cd build
cmake -DCGAL_DIR="$ROOT/build" -DCMAKE_CXX_FLAGS_RELEASE="-DCGAL_NDEBUG" .. cmake -DCGAL_DIR="$ROOT/build" -DCMAKE_CXX_FLAGS_RELEASE="-DCGAL_NDEBUG" ..
make -j2 make -j2
else elif [ "$ARG" != Polyhedron_demo ]; then
echo "No example found for $ARG" echo "No example found for $ARG"
fi fi
@ -64,7 +64,7 @@ do
cd build cd build
cmake -DCGAL_DIR="$ROOT/build" -DCMAKE_CXX_FLAGS_RELEASE="-DCGAL_NDEBUG" .. cmake -DCGAL_DIR="$ROOT/build" -DCMAKE_CXX_FLAGS_RELEASE="-DCGAL_NDEBUG" ..
make -j2 make -j2
else elif [ "$ARG" != Polyhedron_demo ]; then
echo "No test found for $ARG" echo "No test found for $ARG"
fi fi
@ -75,18 +75,27 @@ do
cd build cd build
cmake -DCGAL_DIR="$ROOT/build" -DCMAKE_CXX_FLAGS_RELEASE="-DCGAL_NDEBUG" .. cmake -DCGAL_DIR="$ROOT/build" -DCMAKE_CXX_FLAGS_RELEASE="-DCGAL_NDEBUG" ..
make -j2 make -j2
else elif [ "$ARG" != Polyhedron_demo ]; then
echo "No demo found for $ARG" echo "No demo found for $ARG"
fi fi
if [ "$ARG" == Polyhedron_demo ]; then if [ "$ARG" == Polyhedron_demo ]; then
cd "$ROOT/Polyhedron/demo/Polyhedron" cd "$ROOT/Polyhedron/demo/Polyhedron"
mkdir ./build #install libqglviewer
git clone --depth=1 https://github.com/GillesDebunne/libQGLViewer.git ./qglviewer
cd ./qglviewer/QGLViewer
#use qt5 instead of qt4
export QT_SELECT=5
qmake NO_QT_VERSION_SUFFIX=yes
make -j2
if [ ! -f libQGLViewer.so ]; then
echo "libQGLViewer.so not made"
exit 1
fi
#end install qglviewer
cd "$ROOT/Polyhedron/demo/Polyhedron"
mkdir -p ./build
cd ./build cd ./build
cmake -DCGAL_DIR="$ROOT/build" -DCMAKE_CXX_FLAGS_RELEASE="-DCGAL_NDEBUG" .. cmake -DCGAL_DIR="$ROOT/build" -DQGLVIEWER_INCLUDE_DIR="$ROOT/Polyhedron/demo/Polyhedron/qglviewer" -DQGLVIEWER_LIBRARIES="$ROOT/Polyhedron/demo/Polyhedron/qglviewer/QGLViewer/libQGLViewer.so" -DCMAKE_CXX_FLAGS_RELEASE="-DCGAL_NDEBUG" ..
make -j2 make -j2
fi fi
done done
# Local Variables:
# tab-width: 2
# End:

9
.travis/build_polyhedron_demo.sh
View File

@ -1,9 +0,0 @@
#!/bin/bash
set -e
cd ..
ROOT="$PWD"
cd ./Polyhedron/demo/Polyhedron
mkdir ./build
cd ./build
cmake -DCGAL_DIR="$ROOT/build" -DCMAKE_CXX_FLAGS_RELEASE="-DCGAL_NDEBUG" ..
make -j2

2
.travis/template.txt
View File

@ -39,7 +39,7 @@ addons:
- libqt5gui5 - libqt5gui5
- libqt5widgets5 - libqt5widgets5
- libqt5xml5 - libqt5xml5
- libqglviewer-dev - qt5-qmake
# Not allowed (yet) # Not allowed (yet)
# - geomview # - geomview
# - libglew1.5-dev # - libglew1.5-dev