summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordon bright <hugh.m.bright@gmail.com>2012-12-29 23:10:52 (GMT)
committerdon bright <hugh.m.bright@gmail.com>2012-12-29 23:10:52 (GMT)
commit2230b3c4481c302f8a4baaf06b93cf9d4810dad0 (patch)
treee0f1805c0dc80dfc5d5fb1b9df3547ebf6a58052
parent41269ec0ff9406d707cde7fd584331f1cc44943a (diff)
qmake-macx last detected on eigen. (unix=1 on osx). clarify comments.
-rw-r--r--bison.pri3
-rw-r--r--eigen.pri5
2 files changed, 5 insertions, 3 deletions
diff --git a/bison.pri b/bison.pri
index 14e2e01..7a63f0e 100644
--- a/bison.pri
+++ b/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
diff --git a/eigen.pri b/eigen.pri
index 435355c..efb2d3c 100644
--- a/eigen.pri
+++ b/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
}
contact: Jan Huwald // Impressum