Minor build system fixes

git-svn-id: http://svn.clifford.at/openscad/trunk@492 b57f626f-c46c-0410-a088-ec61d464b74c

1 files changed, 10 insertions, 4 deletions

diff --git a/cgal.pri b/cgal.pri
index fd58779..70c7fcc 100644
--- a/cgal.pri
+++ b/cgal.pri
@@ -1,12 +1,18 @@
 cgal {
-# Uncomment this to enable experimental CGAL tesselation
-# DEFINES += CGAL_TESSELATE
   DEFINES += ENABLE_CGAL
   LIBS += -lCGAL
+
+  # Optionally specify location of CGAL using the 
+  # CGALDIR env. variable
+  CGAL_DIR = $$(CGALDIR)
+  !isEmpty(CGAL_DIR) {
+    INCLUDEPATH += $$CGAL_DIR/include
+    LIBS += -L$$CGAL_DIR/lib
+    message("CGAL location: $$CGAL_DIR")
+  }
   macx {
-    INCLUDEPATH += $(PWD)/../install/include /opt/local/include
     # The -L/usr/lib is to force the linker to use system libraries over MacPort libraries
-    LIBS += -L/usr/lib -L$(PWD)/../install/lib -L/opt/local/lib /opt/local/lib/libgmp.a /opt/local/lib/libmpfr.a /opt/local/lib/libboost_thread-mt.a
+    LIBS += -L/usr/lib -L/opt/local/lib /opt/local/lib/libgmp.a /opt/local/lib/libmpfr.a /opt/local/lib/libboost_thread-mt.a
   }
   else {
     LIBS += -lmpfr