Commit 4a7f1a7c authored by Jan Möbius's avatar Jan Möbius
Browse files

cgal enabled and no virtual destuctor warnings disabled

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@4872 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 3c13b1b3
......@@ -14,5 +14,11 @@ unix {
QMAKE_CXXFLAGS_RELEASE = -O3 -DINCLUDE_TEMPLATES -ftemplate-depth-100 -W -Wall -Wno-unused -DNDEBUG
QMAKE_CFLAGS_DEBUG = -g -DINCLUDE_TEMPLATES -W -Wall -Wno-unused -DDEBUG
QMAKE_CXXFLAGS_DEBUG = -g -DINCLUDE_TEMPLATES -ftemplate-depth-100 -W -Wall -Wno-unused -DDEBUG
macx {
QMAKE_CXXFLAGS_RELEASE += -Wno-non-virtual-dtor
QMAKE_CXXFLAGS_DEBUG += -Wno-non-virtual-dtor
}
}
......@@ -26,14 +26,14 @@ TAUCS_PATH_INC = $${TOPDIR}/MacOS/Libs/taucs/src
TAUCS_PATH_LIB = $${TOPDIR}/MacOS/Libs/taucs/lib/darwin9.0
# CGAL
CGAL_PATH_INC = /usr/include/CGAL/
CGAL_PATH_LIB = /usr/lib
CGAL_PATH_INC = $${TOPDIR}/MacOS/Libs/CGAL-3.4/include
CGAL_PATH_LIB = $${TOPDIR}/MacOS/Libs/CGAL-3.4/lib
# blas
BLAS_PATH_LIB = $${TOPDIR}/MacOS/Libs/CLAPACK/BLAS/BLAS
# lapack
LAP_PATH_INC = $${TOPDIR}/MacOS/Libs/CLAPACK/lapack
LAP_PATH_INC = $${TOPDIR}/MacOS/Libs/CLAPACK/include
LAP_PATH_LIB = $${TOPDIR}/MacOS/Libs/CLAPACK
# wordnet
......@@ -167,13 +167,14 @@ defineTest( cgal ) {
exists ( $${CGAL_PATH_INC} ) {
addLib ( /usr/lib /sw/lib $${CGAL_PATH_LIB}, CGAL ) {
addLib ( /usr/lib /sw/lib $${CGAL_PATH_LIB}, CGALcore++ ) {
addLib ( /usr/lib /sw/lib $${CGAL_PATH_LIB}, CGALimageIO ) {
addLib ( /usr/lib /sw/lib $${CGAL_PATH_LIB}, CGALPDB ) {
addLib ( /usr/lib /sw/lib $${CGAL_PATH_LIB}, CGALQt ) {
addLib ( /usr/lib /sw/lib $${CGAL_PATH_LIB}, CGAL_Core ) {
addLib ( /usr/lib /sw/lib $${CGAL_PATH_LIB}, CGAL_ImageIO ) {
addLib ( /usr/lib /sw/lib $${CGAL_PATH_LIB}, CGAL_PDB ) {
addLib ( /usr/lib /sw/lib $${CGAL_PATH_LIB}, CGAL_Qt4 ) {
INCLUDEPATH *= $${CGAL_PATH_INC}
export(INCLUDEPATH)
lapack()
INCLUDEPATH *= $${CGAL_PATH_INC}
export(INCLUDEPATH)
return(true)
}
......@@ -208,9 +209,8 @@ defineTest( lapack ) {
export(LIBS)
#QMAKE_LIBDIR *= $${HOME}/projects/OpenFlipper/MacOS/Libs/CLAPACK/BLAS/BLAS $${HOME}/projects/OpenFlipper/MacOS/Libs/CLAPACK/lapack $${HOME}/projects/OpenFlipper/MacOS/Libs/CLAPACK/F2CLIBS/libf2c $${HOME}/projects/OpenFlipper/MacOS/Libs/SuperLU_3.0
INCLUDEPATH *= $${LAP_PATH_INC}
INCLUDEPATH *= $${LAP_PATH_INC}
export(INCLUDEPATH)
return(true)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment