Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

qmake-macx last detected on eigen. (unix=1 on osx). clarify comments.

  • Loading branch information...
commit 2230b3c4481c302f8a4baaf06b93cf9d4810dad0 1 parent 41269ec
@donbright donbright authored
Showing with 5 additions and 3 deletions.
  1. +2 −1  bison.pri
  2. +3 −2 eigen.pri
View
3  bison.pri
@@ -24,7 +24,8 @@ unix:linux* {
}
freebsd* {
- # on bsd /usr/bin/bison is outdated, dont use it
+ # on some BSD, /usr/local/bin/bison is newer than
+ # /usr/bin/bison, so try to prefer it.
exists(/usr/local/bin/bison) {
QMAKE_YACC = /usr/local/bin/bison
} else { # look in $PATH
View
5 eigen.pri
@@ -48,14 +48,14 @@ CONFIG(mingw-cross-env) {
isEmpty(EIGEN_INCLUDEPATH) {
freebsd-g++: EIGEN_INCLUDEPATH = /usr/local/include/eigen3
- macx: EIGEN_INCLUDEPATH = /opt/local/include/eigen3
netbsd*: EIGEN_INCLUDEPATH = /usr/pkg/include/eigen3
linux*|hurd*|unix: EIGEN_INCLUDEPATH = /usr/include/eigen3
+ macx: EIGEN_INCLUDEPATH = /opt/local/include/eigen3
!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
linux*|hurd*|unix*: EIGEN_INCLUDEPATH = /usr/include/eigen2
+ macx: EIGEN_INCLUDEPATH = /opt/local/include/eigen2
}
}
@@ -69,6 +69,7 @@ isEmpty(EIGEN_INCLUDEPATH) {
# EIGEN being under 'include/eigen[2-3]' needs special prepending
QMAKE_INCDIR_QT = $$EIGEN_INCLUDEPATH $$QMAKE_INCDIR_QT
+# qmakespecs on netbsd prepend system includes, we need eigen first.
netbsd* {
QMAKE_CXXFLAGS = -I$$EIGEN_INCLUDEPATH $$QMAKE_CXXFLAGS
}
Please sign in to comment.
Something went wrong with that request. Please try again.