mirror of https://github.com/vitalif/openscad
Merge branch 'master' of github.com:openscad/openscad
commit
b308ec270d
15
eigen.pri
15
eigen.pri
|
@ -59,6 +59,21 @@ isEmpty(EIGEN_INCLUDEPATH) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
!exists($$EIGEN_INCLUDEPATH/Eigen/Core) {
|
||||||
|
EIGEN_CFLAGS = $$system("pkg-config --cflags eigen2")
|
||||||
|
EIGEN_INCLUDEPATH = $$replace(EIGEN_CFLAGS,"-I","")
|
||||||
|
}
|
||||||
|
|
||||||
|
!exists($$EIGEN_INCLUDEPATH/Eigen/Core) {
|
||||||
|
EIGEN_CFLAGS = $$system("pkg-config --cflags eigen3")
|
||||||
|
EIGEN_INCLUDEPATH = $$replace(EIGEN_CFLAGS,"-I","")
|
||||||
|
}
|
||||||
|
|
||||||
|
mingw-cross-env {
|
||||||
|
EIGEN_CFLAGS = $$system("i686-pc-mingw32-pkg-config --cflags eigen3")
|
||||||
|
EIGEN_INCLUDEPATH = $$replace(EIGEN_CFLAGS,"-I","")
|
||||||
|
}
|
||||||
|
|
||||||
# disable Eigen SIMD optimizations for platforms where it breaks compilation
|
# disable Eigen SIMD optimizations for platforms where it breaks compilation
|
||||||
!macx {
|
!macx {
|
||||||
!freebsd-g++ {
|
!freebsd-g++ {
|
||||||
|
|
|
@ -291,7 +291,7 @@ SOURCES += src/version_check.cc \
|
||||||
src/OpenCSGWarningDialog.cc \
|
src/OpenCSGWarningDialog.cc \
|
||||||
src/editor.cc \
|
src/editor.cc \
|
||||||
src/GLView.cc \
|
src/GLView.cc \
|
||||||
src/QGLview.cc \
|
src/QGLView.cc \
|
||||||
src/AutoUpdater.cc \
|
src/AutoUpdater.cc \
|
||||||
\
|
\
|
||||||
src/builtin.cc \
|
src/builtin.cc \
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
# the setenv-mingw-xbuild.sh script will set MXEDIR
|
# the setenv-mingw-xbuild.sh script will set MXEDIR
|
||||||
# cd openscad/tests && mkdir build-mingw32 && cd build-mingw32
|
# cd openscad/tests && mkdir build-mingw32 && cd build-mingw32
|
||||||
# # set env variables:
|
# # set env variables:
|
||||||
# PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$MXEDIR/usr/i686-pc-mingw32/qt/lib/pkgconfig
|
|
||||||
# OPENSCADPATH=../../libraries # (to find MCAD for some tests)
|
# OPENSCADPATH=../../libraries # (to find MCAD for some tests)
|
||||||
# cmake .. -DCMAKE_TOOLCHAIN_FILE=../CMingw-cross-env.cmake \
|
# cmake .. -DCMAKE_TOOLCHAIN_FILE=../CMingw-cross-env.cmake \
|
||||||
# -DMINGW_CROSS_ENV_DIR=$MXEDIR
|
# -DMINGW_CROSS_ENV_DIR=$MXEDIR
|
||||||
|
@ -125,6 +124,10 @@ set(QT_UIC_EXECUTABLE ${MINGW_CROSS_ENV_DIR}/usr/bin/i686-pc-mingw32-uic)
|
||||||
|
|
||||||
function(mingw_cross_env_find_qt)
|
function(mingw_cross_env_find_qt)
|
||||||
# called from CMakeLists.txt
|
# called from CMakeLists.txt
|
||||||
|
set(PKGC_DEST ${MINGW_CROSS_ENV_DIR}/usr/i686-pc-mingw32/lib/pkgconfig)
|
||||||
|
set(QT_PKGC_SRC ${MINGW_CROSS_ENV_DIR}/usr/i686-pc-mingw32/qt/lib/pkgconfig/)
|
||||||
|
file(COPY ${QT_PKGC_SRC} DESTINATION ${PKGC_DEST} FILES_MATCHING PATTERN "*.pc")
|
||||||
|
|
||||||
find_package( PkgConfig )
|
find_package( PkgConfig )
|
||||||
pkg_check_modules( QTCORE QtCore )
|
pkg_check_modules( QTCORE QtCore )
|
||||||
pkg_check_modules( QTGUI QtGui )
|
pkg_check_modules( QTGUI QtGui )
|
||||||
|
|
Loading…
Reference in New Issue