mirror of https://github.com/vitalif/openscad
Remove eigen2 detection, eigen3 is required.
parent
b488242548
commit
ba2f150f33
33
eigen.pri
33
eigen.pri
|
@ -1,18 +1,14 @@
|
||||||
# Detect eigen3 + eigen2, then use this priority list to determine
|
# Detect eigen3
|
||||||
# which eigen to use:
|
|
||||||
#
|
#
|
||||||
# Priority
|
# Priority
|
||||||
# 0. EIGENDIR if set (also EIGEN2DIR for backwards compatability)
|
# 0. EIGENDIR if set
|
||||||
# 1. OPENSCAD_LIBRARIES eigen3
|
# 1. OPENSCAD_LIBRARIES eigen3
|
||||||
# 2. OPENSCAD_LIBRARIES eigen2
|
|
||||||
# 3. system's standard include paths for eigen3
|
# 3. system's standard include paths for eigen3
|
||||||
# 4. system's standard include paths for eigen2
|
|
||||||
|
|
||||||
eigen {
|
eigen {
|
||||||
|
|
||||||
# read environment variables
|
# read environment variables
|
||||||
OPENSCAD_LIBRARIES_DIR = $$(OPENSCAD_LIBRARIES)
|
OPENSCAD_LIBRARIES_DIR = $$(OPENSCAD_LIBRARIES)
|
||||||
EIGEN2_DIR = $$(EIGEN2DIR)
|
|
||||||
EIGEN_DIR = $$(EIGENDIR)
|
EIGEN_DIR = $$(EIGENDIR)
|
||||||
|
|
||||||
# Optionally specify location of Eigen3 using the
|
# Optionally specify location of Eigen3 using the
|
||||||
|
@ -23,20 +19,8 @@ EIGEN_DIR = $$(EIGENDIR)
|
||||||
EIGEN_INCLUDEPATH = $$OPENSCAD_LIBRARIES_DIR/include/eigen3
|
EIGEN_INCLUDEPATH = $$OPENSCAD_LIBRARIES_DIR/include/eigen3
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
isEmpty(EIGEN_INCLUDEPATH) {
|
|
||||||
exists($$OPENSCAD_LIBRARIES_DIR/include/eigen2) {
|
|
||||||
EIGEN_INCLUDEPATH = $$OPENSCAD_LIBRARIES_DIR/include/eigen2
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# Optionally specify location of Eigen using the
|
|
||||||
# EIGENDIR env. variable (EIGEN2 for backwards compatability)
|
|
||||||
!isEmpty(EIGEN2_DIR) {
|
|
||||||
EIGEN_INCLUDEPATH = $$EIGEN2_DIR
|
|
||||||
message("User set EIGEN location: $$EIGEN_INCLUDEPATH")
|
|
||||||
}
|
|
||||||
!isEmpty(EIGEN_DIR) {
|
!isEmpty(EIGEN_DIR) {
|
||||||
EIGEN_INCLUDEPATH = $$EIGEN_DIR
|
EIGEN_INCLUDEPATH = $$EIGEN_DIR
|
||||||
message("User set EIGEN location: $$EIGEN_INCLUDEPATH")
|
message("User set EIGEN location: $$EIGEN_INCLUDEPATH")
|
||||||
|
@ -47,17 +31,6 @@ isEmpty(EIGEN_INCLUDEPATH) {
|
||||||
freebsd-g++: EIGEN_INCLUDEPATH = /usr/local/include/eigen3
|
freebsd-g++: EIGEN_INCLUDEPATH = /usr/local/include/eigen3
|
||||||
netbsd*: EIGEN_INCLUDEPATH = /usr/pkg/include/eigen3
|
netbsd*: EIGEN_INCLUDEPATH = /usr/pkg/include/eigen3
|
||||||
macx: EIGEN_INCLUDEPATH = /opt/local/include/eigen3
|
macx: EIGEN_INCLUDEPATH = /opt/local/include/eigen3
|
||||||
!exists($$EIGEN_INCLUDEPATH) {
|
|
||||||
linux*|hurd*|unix*: EIGEN_INCLUDEPATH = /usr/include/eigen2
|
|
||||||
freebsd-g++: EIGEN_INCLUDEPATH = /usr/local/include/eigen2
|
|
||||||
netbsd*: EIGEN_INCLUDEPATH = /usr/pkg/include/eigen2
|
|
||||||
macx: EIGEN_INCLUDEPATH = /opt/local/include/eigen2
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
!exists($$EIGEN_INCLUDEPATH/Eigen/Core) {
|
|
||||||
EIGEN_CFLAGS = $$system("pkg-config --cflags eigen2")
|
|
||||||
EIGEN_INCLUDEPATH = $$replace(EIGEN_CFLAGS,"-I","")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
!exists($$EIGEN_INCLUDEPATH/Eigen/Core) {
|
!exists($$EIGEN_INCLUDEPATH/Eigen/Core) {
|
||||||
|
@ -72,7 +45,7 @@ isEmpty(EIGEN_INCLUDEPATH) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# EIGEN being under 'include/eigen[2-3]' needs special prepending
|
# EIGEN being under 'include/eigen3' needs special prepending
|
||||||
contains(QT_VERSION, ^5\\..*) {
|
contains(QT_VERSION, ^5\\..*) {
|
||||||
QMAKE_INCDIR = $$EIGEN_INCLUDEPATH $$QMAKE_INCDIR
|
QMAKE_INCDIR = $$EIGEN_INCLUDEPATH $$QMAKE_INCDIR
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue