diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-03-09 02:06:42 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-03-09 02:07:40 (GMT) |
| commit | 1221b66edb06e1b4f009b0ce3ebee1fb1651aa4e (patch) | |
| tree | cb8afb2dbe7962f66ae8b08f95f45cf2e8432b80 | |
| parent | 9d97afa3764770119cbe0751d3384c6bd8f77f28 (diff) | |
use pkgconfig for eigen + fix mingw builds
| -rw-r--r-- | eigen.pri | 15 | ||||
| -rw-r--r-- | openscad.pro | 2 | ||||
| -rw-r--r-- | tests/CMingw-cross-env.cmake | 5 |
3 files changed, 20 insertions, 2 deletions
@@ -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 !macx { !freebsd-g++ { diff --git a/openscad.pro b/openscad.pro index c7a3e43..6f3ddfb 100644 --- a/openscad.pro +++ b/openscad.pro @@ -291,7 +291,7 @@ SOURCES += src/version_check.cc \ src/OpenCSGWarningDialog.cc \ src/editor.cc \ src/GLView.cc \ - src/QGLview.cc \ + src/QGLView.cc \ src/AutoUpdater.cc \ \ src/builtin.cc \ diff --git a/tests/CMingw-cross-env.cmake b/tests/CMingw-cross-env.cmake index 186c35e..c2883eb 100644 --- a/tests/CMingw-cross-env.cmake +++ b/tests/CMingw-cross-env.cmake @@ -13,7 +13,6 @@ # the setenv-mingw-xbuild.sh script will set MXEDIR # cd openscad/tests && mkdir build-mingw32 && cd build-mingw32 # # 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) # cmake .. -DCMAKE_TOOLCHAIN_FILE=../CMingw-cross-env.cmake \ # -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) # 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 ) pkg_check_modules( QTCORE QtCore ) pkg_check_modules( QTGUI QtGui ) |