Improved Mac OS X deployment - hopefully this doesn't break builds on other platforms

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

1 files changed, 11 insertions, 16 deletions

diff --git a/cgal.pri b/cgal.pri
index 70c7fcc..0c1fd30 100644
--- a/cgal.pri
+++ b/cgal.pri
@@ -1,22 +1,17 @@
 cgal {
   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")
+  !deploy {
+    # 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 {
-    # The -L/usr/lib is to force the linker to use system libraries over MacPort libraries
-    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
-  }
-  win32:LIBS += -lboost_thread -lgmp
+
+  LIBS += -lCGAL -lmpfr -lgmp -lboost_thread
   QMAKE_CXXFLAGS += -frounding-math
 }