diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-12-17 18:56:50 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-12-17 18:56:50 (GMT) |
| commit | ee2cdb6489121ab5f77522053fd4142fb06a6f2b (patch) | |
| tree | e388bfab01a0ffbd039132f319ba517799fd1f1f /eigen2.pri | |
| parent | cae91b57cf839ee7b8902ca8b47efd1dd6875121 (diff) | |
| parent | ef29553226ddb3f8f0565dbd6004d76e26c80ddc (diff) | |
Merge remote branch 'upstream/master'
Conflicts:
openscad.pro
Diffstat (limited to 'eigen2.pri')
| -rw-r--r-- | eigen2.pri | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -3,19 +3,22 @@ eigen2 { # EIGEN2DIR env. variable EIGEN2_DIR = $$(EIGEN2DIR) !isEmpty(EIGEN2_DIR) { - INCLUDEPATH += $$EIGEN2_DIR + EIGEN2_INCLUDEPATH = $$EIGEN2_DIR } else { CONFIG(mingw-cross-env) { - INCLUDEPATH += mingw-cross-env/include/eigen2 + EIGEN2_INCLUDEPATH = mingw-cross-env/include/eigen2 } else { - freebsd-g++: INCLUDEPATH += /usr/local/include/eigen2 - macx: INCLUDEPATH += /opt/local/include/eigen2 - !macx:!freebsd-g++:INCLUDEPATH += /usr/include/eigen2 + freebsd-g++: EIGEN2_INCLUDEPATH *= /usr/local/include/eigen2 + macx: EIGEN2_INCLUDEPATH *= /opt/local/include/eigen2 + !macx:!freebsd-g++:!win32:EIGEN2_INCLUDEPATH *= /usr/include/eigen2 } } - # disable Eigen SIMD optimizations for non-Mac OSX + # eigen2 being under 'include/eigen2' needs special prepending + QMAKE_INCDIR_QT = $$EIGEN2_INCLUDEPATH $$QMAKE_INCDIR_QT + + # disable Eigen SIMD optimizations for platforms where it breaks compilation !macx { !freebsd-g++ { QMAKE_CXXFLAGS += -DEIGEN_DONT_ALIGN |