vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:openscad/openscad

felipesanches-svg
Marius Kintel 2013-03-09 10:39:55 -05:00
parent b7bb0071fb 1221b66edb
commit b308ec270d
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
eigen.pri
View File

@ -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++ {

2
openscad.pro
View File

@ -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 \

5
tests/CMingw-cross-env.cmake
View File

@ -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 )