diff options
author | don bright <hugh.m.bright@gmail.com> | 2012-12-25 00:41:30 (GMT) |
---|---|---|
committer | don bright <hugh.m.bright@gmail.com> | 2012-12-25 00:41:30 (GMT) |
commit | 6693c3b3648e63dfcacd65c3eff9b02e7ea6da32 (patch) | |
tree | 05219ad74e0353bc5d3532152f64da80dc63ee5f | |
parent | b39b2ba9d066afd73958eeea3c50fa7c43326bab (diff) |
fix eigen detection bug i introduced yesterday
-rw-r--r-- | eigen.pri | 2 | ||||
-rw-r--r-- | scripts/setenv-unibuild.sh | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -51,7 +51,7 @@ isEmpty(EIGEN_INCLUDEPATH) { macx: EIGEN_INCLUDEPATH = /opt/local/include/eigen3 netbsd*: EIGEN_INCLUDEPATH = /usr/pkg/include/eigen3 linux*|hurd*|unix: EIGEN_INCLUDEPATH = /usr/include/eigen3 - isEmpty(EIGEN_INCLUDEPATH) { + !exists(EIGEN_INCLUDEPATH) { freebsd-g++: EIGEN_INCLUDEPATH = /usr/local/include/eigen2 macx: EIGEN_INCLUDEPATH = /opt/local/include/eigen2 netbsd*: EIGEN_INCLUDEPATH = /usr/pkg/include/eigen2 diff --git a/scripts/setenv-unibuild.sh b/scripts/setenv-unibuild.sh index 456c7cd..f83a2cf 100644 --- a/scripts/setenv-unibuild.sh +++ b/scripts/setenv-unibuild.sh @@ -17,7 +17,7 @@ setenv_common() else # otherwise, assume its being run 'out of tree'. treat it somewhat like # "configure" or "cmake", so you can build dependencies where u wish. - echo "Not in OpenSCAD dir... using current directory as base of build" + echo "Warning: Not in OpenSCAD src dir... using current directory as base of build" BASEDIR=$PWD/openscad_deps fi fi |