From 6693c3b3648e63dfcacd65c3eff9b02e7ea6da32 Mon Sep 17 00:00:00 2001 From: don bright Date: Mon, 24 Dec 2012 18:41:30 -0600 Subject: fix eigen detection bug i introduced yesterday diff --git a/eigen.pri b/eigen.pri index fd7ac74..435355c 100644 --- a/eigen.pri +++ b/eigen.pri @@ -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 -- cgit v0.10.1