Skip to content
This repository
Browse code

detect netbsd / freebsd after linux not before, for bison/flex.

  • Loading branch information...
commit ad45e8a8c52878ed6f3c7fdfb3198f18b0f8875e 1 parent 9deb7de
donbright authored December 23, 2012
16  bison.pri
@@ -17,7 +17,13 @@ win32 {
17 17
   QMAKE_EXTRA_COMPILERS += bison_header
18 18
 }
19 19
 
20  
-unix:freebsd-g++ {
  20
+unix:linux* {
  21
+  exists(/usr/bin/bison) {
  22
+    QMAKE_YACC = /usr/bin/bison
  23
+  }
  24
+}
  25
+
  26
+freebsd* {
21 27
   # on bsd /usr/bin/bison is outdated, dont use it
22 28
   exists(/usr/local/bin/bison) {
23 29
     QMAKE_YACC = /usr/local/bin/bison
@@ -26,16 +32,10 @@ unix:freebsd-g++ {
26 32
   }
27 33
 }
28 34
 
29  
-unix:netbsd* {
  35
+netbsd* {
30 36
   exists(/usr/pkg/bin/bison) {
31 37
     QMAKE_YACC = /usr/pkg/bin/bison
32 38
   } else { # look in $PATH
33 39
     QMAKE_YACC = bison
34 40
   }
35 41
 }
36  
-
37  
-unix:linux* {
38  
-  exists(/usr/bin/bison) {
39  
-    QMAKE_YACC = /usr/bin/bison
40  
-  }
41  
-}
6  eigen.pri
@@ -49,13 +49,13 @@ CONFIG(mingw-cross-env) {
49 49
 isEmpty(EIGEN_INCLUDEPATH) {
50 50
   freebsd-g++: EIGEN_INCLUDEPATH = /usr/local/include/eigen3
51 51
   macx: EIGEN_INCLUDEPATH = /opt/local/include/eigen3
52  
-  linux*|hurd*: EIGEN_INCLUDEPATH = /usr/include/eigen3
53 52
   netbsd*: EIGEN_INCLUDEPATH = /usr/pkg/include/eigen3
54  
-  !exists($$EIGEN_INCLUDEPATH) {
  53
+  linux*|hurd*|unix: EIGEN_INCLUDEPATH = /usr/include/eigen3
  54
+  isEmpty(EIGEN_INCLUDEPATH) {
55 55
     freebsd-g++: EIGEN_INCLUDEPATH = /usr/local/include/eigen2
56 56
     macx: EIGEN_INCLUDEPATH = /opt/local/include/eigen2
57  
-    linux*|hurd*: EIGEN_INCLUDEPATH = /usr/include/eigen2
58 57
     netbsd*: EIGEN_INCLUDEPATH = /usr/pkg/include/eigen2
  58
+    linux*|hurd*|unix*: EIGEN_INCLUDEPATH = /usr/include/eigen2
59 59
   }
60 60
 }
61 61
 
15  flex.pri
@@ -9,16 +9,17 @@ win32 {
9 9
   QMAKE_EXTRA_COMPILERS += flex
10 10
 }
11 11
 
12  
-unix:freebsd-g++ {
  12
+unix:linux* {
  13
+  exists(/usr/bin/flex) {
  14
+    QMAKE_LEX = /usr/bin/flex
  15
+  }
  16
+}
  17
+
  18
+freebsd* {
13 19
   QMAKE_LEX = /usr/local/bin/flex
14 20
 }
15 21
 
16  
-unix:netbsd* {
  22
+netbsd* {
17 23
   QMAKE_LEX = /usr/pkg/bin/flex
18 24
 }
19 25
 
20  
-unix:linux* {
21  
-  exists(/usr/bin/flex) {
22  
-    QMAKE_LEX = /usr/bin/flex
23  
-  }
24  
-}
1  glew.pri
@@ -6,7 +6,6 @@ glew {
6 6
     QMAKE_INCDIR += $$GLEW_DIR/include
7 7
     QMAKE_LIBDIR += $$GLEW_DIR/lib
8 8
     QMAKE_LIBDIR += $$GLEW_DIR/lib64
9  
-    message("GLEW location: $$GLEW_DIR")
10 9
   }
11 10
 
12 11
   unix:LIBS += -lGLEW
11  openscad.pro
@@ -116,11 +116,6 @@ netbsd* {
116 116
 	QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-compare
117 117
 }
118 118
 
119  
-CONFIG(skip-version-check) {
120  
-  # force the use of outdated libraries
121  
-  DEFINES += OPENSCAD_SKIP_VERSION_CHECK
122  
-}
123  
-
124 119
 # Application configuration
125 120
 macx:CONFIG += mdi
126 121
 CONFIG += cgal
@@ -144,6 +139,12 @@ CONFIG(mingw-cross-env) {
144 139
   include(mingw-cross-env.pri)
145 140
 }
146 141
 
  142
+# force the use of outdated libraries
  143
+CONFIG(skip-version-check) {
  144
+  DEFINES += OPENSCAD_SKIP_VERSION_CHECK
  145
+}
  146
+
  147
+
147 148
 win32 {
148 149
   FLEXSOURCES = src/lexer.l
149 150
   BISONSOURCES = src/parser.y

0 notes on commit ad45e8a

Please sign in to comment.
Something went wrong with that request. Please try again.