diff options
| author | don bright <hugh.m.bright@gmail.com> | 2012-08-19 13:10:33 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2012-08-19 13:10:33 (GMT) |
| commit | 5d31f56d9313dcaa8f2304819b7d54ff9aaaf01a (patch) | |
| tree | b34dfb613c722baf7a50e24acfcb34c6f042aa1c /eigen.pri | |
| parent | a9045315baac2e8bd24428668cfa88f116984af7 (diff) | |
look for EIGENDIR env var. (also look for EIGEN2DIR for backwards compatability)
Diffstat (limited to 'eigen.pri')
| -rw-r--r-- | eigen.pri | 23 |
1 files changed, 10 insertions, 13 deletions
@@ -2,18 +2,18 @@ # which eigen to use: # # Priority -# 3. EIGEN3DIR / EIGEN2DIR if set +# 0. EIGENDIR if set (also EIGEN2DIR for backwards compatability) # 1. OPENSCAD_LIBRARIES eigen3 # 2. OPENSCAD_LIBRARIES eigen2 -# 4. system's standard include paths for eigen3 -# 5. system's standard include paths for eigen2 +# 3. system's standard include paths for eigen3 +# 4. system's standard include paths for eigen2 eigen { # read environment variables OPENSCAD_LIBRARIES_DIR = $$(OPENSCAD_LIBRARIES) EIGEN2_DIR = $$(EIGEN2DIR) -EIGEN3_DIR = $$(EIGEN3DIR) +EIGEN_DIR = $$(EIGENDIR) CONFIG(mingw-cross-env) { EIGEN_INCLUDEPATH = mingw-cross-env/include/eigen2 @@ -36,17 +36,14 @@ CONFIG(mingw-cross-env) { # Optionally specify location of Eigen using the -# EIGEN3DIR env. variable -!isEmpty(EIGEN3_DIR) { - EIGEN_INCLUDEPATH = $$EIGEN3_DIR - message("EIGEN3 location: $$EIGEN3_INCLUDEPATH") -} - -# Optionally specify location of Eigen using the -# EIGEN2DIR env. variable +# EIGENDIR env. variable (EIGEN2 for backwards compatability) !isEmpty(EIGEN2_DIR) { EIGEN_INCLUDEPATH = $$EIGEN2_DIR - message("EIGEN2 location: $$EIGEN2_INCLUDEPATH") + message("User set EIGEN location: $$EIGEN2_INCLUDEPATH") +} +!isEmpty(EIGEN_DIR) { + EIGEN_INCLUDEPATH = $$EIGEN_DIR + message("User set EIGEN location: $$EIGEN_INCLUDEPATH") } isEmpty(EIGEN_INCLUDEPATH) { |