mirror of https://github.com/vitalif/openscad
prevent CGAL from linking wrong version of Boost
parent
5138dca395
commit
293d44384b
|
@ -281,6 +281,7 @@ build_cgal()
|
|||
# 3.7 curl --insecure -O https://gforge.inria.fr/frs/download.php/27641/CGAL-$version.tar.gz
|
||||
fi
|
||||
tar xf CGAL-$version.tar.bz2
|
||||
cp $OPENSCAD_SCRIPTDIR/../tests/FindBoost.cmake CGAL-$version/cmake/modules/
|
||||
cd CGAL-$version
|
||||
mkdir bin
|
||||
cd bin
|
||||
|
@ -290,10 +291,11 @@ build_cgal()
|
|||
else
|
||||
CGAL_BUILDTYPE="Debug"
|
||||
fi
|
||||
# -DBoost_DEBUG=1 # < add this to debug boost issues
|
||||
if [ "`echo $2 | grep use-sys-libs`" ]; then
|
||||
cmake -DCMAKE_INSTALL_PREFIX=$DEPLOYDIR -DWITH_CGAL_Qt3=OFF -DWITH_CGAL_Qt4=OFF -DWITH_CGAL_ImageIO=OFF -DCMAKE_BUILD_TYPE=$CGAL_BUILDTYPE ..
|
||||
else
|
||||
cmake -DCMAKE_INSTALL_PREFIX=$DEPLOYDIR -DGMP_INCLUDE_DIR=$DEPLOYDIR/include -DGMP_LIBRARIES=$DEPLOYDIR/lib/libgmp.so -DGMPXX_LIBRARIES=$DEPLOYDIR/lib/libgmpxx.so -DGMPXX_INCLUDE_DIR=$DEPLOYDIR/include -DMPFR_INCLUDE_DIR=$DEPLOYDIR/include -DMPFR_LIBRARIES=$DEPLOYDIR/lib/libmpfr.so -DWITH_CGAL_Qt3=OFF -DWITH_CGAL_Qt4=OFF -DWITH_CGAL_ImageIO=OFF -DBOOST_ROOT=$DEPLOYDIR -DCMAKE_BUILD_TYPE=$CGAL_BUILD_TYPE ..
|
||||
cmake -DCMAKE_INSTALL_PREFIX=$DEPLOYDIR -DGMP_INCLUDE_DIR=$DEPLOYDIR/include -DGMP_LIBRARIES=$DEPLOYDIR/lib/libgmp.so -DGMPXX_LIBRARIES=$DEPLOYDIR/lib/libgmpxx.so -DGMPXX_INCLUDE_DIR=$DEPLOYDIR/include -DMPFR_INCLUDE_DIR=$DEPLOYDIR/include -DMPFR_LIBRARIES=$DEPLOYDIR/lib/libmpfr.so -DWITH_CGAL_Qt3=OFF -DWITH_CGAL_Qt4=OFF -DWITH_CGAL_ImageIO=OFF -DBOOST_ROOT=$DEPLOYDIR -DBoost_NO_SYSTEM_PATHS=1 -DCMAKE_BUILD_TYPE=$CGAL_BUILD_TYPE ..
|
||||
fi
|
||||
make -j$NUMCPU
|
||||
make install
|
||||
|
@ -447,7 +449,8 @@ build_eigen()
|
|||
# the 'dirname' command installed
|
||||
|
||||
if [ "`command -v dirname`" ]; then
|
||||
OPENSCAD_SCRIPTDIR=`dirname $0`
|
||||
OPENSCAD_SCRIPTDIR=$( dirname $( cd `dirname $0`; pwd ) )
|
||||
OPENSCAD_SCRIPTDIR=$OPENSCAD_SCRIPTDIR/scripts
|
||||
else
|
||||
if [ ! -f openscad.pro ]; then
|
||||
echo "Must be run from the OpenSCAD source root directory (dont have 'dirname')"
|
||||
|
@ -501,7 +504,7 @@ fi
|
|||
# (They can be built singly here by passing a command line arg to the script)
|
||||
if [ $1 ]; then
|
||||
if [ $1 = "cgal" ]; then
|
||||
build_cgal 4.0.2 use-sys-libs
|
||||
build_cgal 4.1 use-sys-libs
|
||||
exit
|
||||
fi
|
||||
if [ $1 = "opencsg" ]; then
|
||||
|
|
Loading…
Reference in New Issue