diff options
| author | don bright <hugh.m.bright@gmail.com> | 2012-08-18 20:28:36 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2012-08-18 20:28:36 (GMT) |
| commit | 9f6819e68501de16563aeaaadd65dfc915092169 (patch) | |
| tree | 26beade954d4748b44ec303e2fd2e12584abe885 /scripts | |
| parent | 8740ac3574c5249c9c22f5436d3b14f4f0563a66 (diff) | |
initial rework to enable eigen3 per issue #174.
1. enable eigen3 in qmake build system
2. convert Transform3d and cwise() per the eigen2->eigen3 porting faq online
3. get rid of 'using namespace boost::filesystem' as it conflicts with eigen3
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/linux-build-dependencies.sh | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/scripts/linux-build-dependencies.sh b/scripts/linux-build-dependencies.sh index aee423c..6f31d5d 100755 --- a/scripts/linux-build-dependencies.sh +++ b/scripts/linux-build-dependencies.sh @@ -248,6 +248,7 @@ build_eigen() rm -rf eigen-$version ## Directory name for v2.0.17 rm -rf eigen-eigen-b23437e61a07 + rm -rf eigen-eigen-43d9075b23ef # 3.1.1 if [ ! -f eigen-$version.tar.bz2 ]; then curl -LO http://bitbucket.org/eigen/eigen/get/$version.tar.bz2 mv $version.tar.bz2 eigen-$version.tar.bz2 @@ -255,13 +256,15 @@ build_eigen() tar xjf eigen-$version.tar.bz2 ## File name for v2.0.17 ln -s eigen-eigen-b23437e61a07 eigen-$version + ln -s eigen-eigen-43d9075b23ef eigen-$version # 3.1.1 cd eigen-$version - cmake -DCMAKE_INSTALL_PREFIX=$DEPLOYDIR + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX=$DEPLOYDIR .. make -j$NUMCPU make install } - OPENSCADDIR=$PWD if [ ! -f $OPENSCADDIR/openscad.pro ]; then echo "Must be run from the OpenSCAD source root directory" @@ -321,12 +324,13 @@ fi # build_eigen 2.0.17 -build_gmp 5.0.5 -build_mpfr 3.1.1 -build_boost 1.47.0 +#build_eigen 3.1.1 +#build_gmp 5.0.5 +#build_mpfr 3.1.1 +#build_boost 1.47.0 # NB! For CGAL, also update the actual download URL in the function -build_cgal 4.0.2 -build_glew 1.7.0 -build_opencsg 1.3.2 +#build_cgal 4.0.2 +#build_glew 1.7.0 +#build_opencsg 1.3.2 echo "OpenSCAD dependencies built and installed to " $BASEDIR |