diff options
author | Marius Kintel <marius@kintel.net> | 2012-01-04 22:07:32 (GMT) |
---|---|---|
committer | Marius Kintel <marius@kintel.net> | 2012-01-04 22:07:32 (GMT) |
commit | fdce8d15fc4a927d1a6a257783dde5054d9f3e7b (patch) | |
tree | 6a779b50ef65474af9c539ad7d42268f7e760ae8 /eigen2.pri | |
parent | cbabbaed700536b3a1f513fd5a07d25382cb137f (diff) | |
parent | ba8aa515d14cf270c9d0fdf50b4c7c55b3c416a8 (diff) |
Merge branch 'master' into boost_filesystem
Conflicts:
boost.pri
src/lexer.l
tests/CMakeLists.txt
Diffstat (limited to 'eigen2.pri')
-rw-r--r-- | eigen2.pri | 39 |
1 files changed, 28 insertions, 11 deletions
@@ -1,20 +1,37 @@ eigen2 { + + CONFIG(mingw-cross-env) { + EIGEN2_INCLUDEPATH = mingw-cross-env/include/eigen2 + } + # Optionally specify location of Eigen2 using the - # EIGEN2DIR env. variable - EIGEN2_DIR = $$(EIGEN2DIR) - !isEmpty(EIGEN2_DIR) { - EIGEN2_INCLUDEPATH = $$EIGEN2_DIR + # OPENSCAD_LIBRARIES env. variable + isEmpty(EIGEN2_INCLUDEPATH) { + OPENSCAD_LIBRARIES_DIR = $$(OPENSCAD_LIBRARIES) + !isEmpty(OPENSCAD_LIBRARIES_DIR) { + exists($$OPENSCAD_LIBRARIES_DIR/include/eigen2) { + EIGEN2_INCLUDEPATH = $$OPENSCAD_LIBRARIES_DIR/include/eigen2 + } + } } - else { - CONFIG(mingw-cross-env) { - EIGEN2_INCLUDEPATH = mingw-cross-env/include/eigen2 - } else { - freebsd-g++: EIGEN2_INCLUDEPATH *= /usr/local/include/eigen2 - macx: EIGEN2_INCLUDEPATH *= /opt/local/include/eigen2 - !macx:!freebsd-g++:!win32:EIGEN2_INCLUDEPATH *= /usr/include/eigen2 + + # Optionally specify location of Eigen2 using the + # EIGEN2DIR env. variable + isEmpty(EIGEN2_INCLUDEPATH) { + EIGEN2_DIR = $$(EIGEN2DIR) + !isEmpty(EIGEN2_DIR) { + EIGEN2_INCLUDEPATH = $$EIGEN2_DIR + message("EIGEN2 location: $$EIGEN2_INCLUDEPATH") } } + isEmpty(EIGEN2_INCLUDEPATH) { + freebsd-g++: EIGEN2_INCLUDEPATH = /usr/local/include/eigen2 + macx: EIGEN2_INCLUDEPATH = /opt/local/include/eigen2 + linux*: EIGEN2_INCLUDEPATH = /usr/include/eigen2 + netbsd*: EIGEN2_INCLUDEPATH = /usr/pkg/include/eigen2 + } + # eigen2 being under 'include/eigen2' needs special prepending QMAKE_INCDIR_QT = $$EIGEN2_INCLUDEPATH $$QMAKE_INCDIR_QT |