diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-02-16 01:43:40 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-02-16 01:43:40 (GMT) |
| commit | c7f855b130323964636ea34e1d0e8ddbeb91fb81 (patch) | |
| tree | bc0f07892481ac0554473b4d5772a1ea67b7368b | |
| parent | 61a4fc30317717769240602095af531a7e297fa2 (diff) | |
| parent | f4c866086462f172063c2adca6d840c92cc79b98 (diff) | |
Merge branch 'issue11_2' of github.com:openscad/openscad into issue11_2
| -rwxr-xr-x | scripts/uni-build-dependencies.sh | 9 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/scripts/uni-build-dependencies.sh b/scripts/uni-build-dependencies.sh index 09b6b79..f82500e 100755 --- a/scripts/uni-build-dependencies.sh +++ b/scripts/uni-build-dependencies.sh @@ -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 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3f70b02..0506045 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -372,7 +372,9 @@ inclusion(CGAL_DIR CGAL_INCLUDE_DIRS) # Imagemagick -if (NOT SKIP_IMAGEMAGICK) +if (SKIP_IMAGEMAGICK) + set(ImageMagick_convert_EXECUTABLE "echo") +else() find_package(ImageMagick COMPONENTS convert) if (ImageMagick_convert_FOUND) message(STATUS "ImageMagick convert executable found: " ${ImageMagick_convert_EXECUTABLE}) |