Merge branch 'master' into boost_filesystem

Conflicts:
	boost.pri
	tests/CMakeLists.txt

1 files changed, 9 insertions, 12 deletions

diff --git a/cgal.pri b/cgal.pri
index 1d9ef22..7cd5389 100644
--- a/cgal.pri
+++ b/cgal.pri
@@ -1,23 +1,21 @@
 cgal {
   DEFINES += ENABLE_CGAL
 
-  isEmpty(DEPLOYDIR) {
-    # Optionally specify location of CGAL using the 
-    # CGALDIR env. variable
-    CGAL_DIR = $$(CGALDIR)
-    !isEmpty(CGAL_DIR) {
-      INCLUDEPATH += $$CGAL_DIR/include
-      win32: INCLUDEPATH += $$CGAL_DIR/auxiliary/gmp/include
-      LIBS += -L$$CGAL_DIR/lib
-      message("CGAL location: $$CGAL_DIR")
-    }
+  # Optionally specify location of CGAL using the 
+  # CGALDIR env. variable
+  CGAL_DIR = $$(CGALDIR)
+  !isEmpty(CGAL_DIR) {
+    QMAKE_INCDIR += $$CGAL_DIR/include
+    win32: QMAKE_INCDIR += $$CGAL_DIR/auxiliary/gmp/include
+    QMAKE_LIBDIR += $$CGAL_DIR/lib
+    message("CGAL location: $$CGAL_DIR")
   }
 
   CONFIG(mingw-cross-env) {
     LIBS += -lgmp -lmpfr -lCGAL
     QMAKE_CXXFLAGS += -frounding-math 
   } else {
-    windows {
+    win32 {
       *-g++* { 
         QMAKE_CXXFLAGS += -frounding-math 
       }
@@ -27,5 +25,4 @@ cgal {
       QMAKE_CXXFLAGS += -frounding-math 
     }
   }
-
 }