Commit 277ea9b5 authored by Jan Möbius's avatar Jan Möbius
Browse files

Working cholmod and taucs for macos

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@4863 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 0c38dc82
......@@ -22,8 +22,8 @@ SLU_PATH_INC = $${TOPDIR}/MacOS/Libs/SuperLU_3.0
SLU_PATH_LIB = $${TOPDIR}/MacOS/Libs/SuperLU_3.0/SuperLU
# taucs
TAUCS_PATH_INC = $${TOPDIR}/MacOS/Libs/taucs_ready/include
TAUCS_PATH_LIB = $${TOPDIR}/MacOS/Libs/taucs_ready/lib
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/
......@@ -41,8 +41,8 @@ WN_PATH_INC = /usr/local/WordNet-3.0/include
WN_PATH_LIB = /usr/local/WordNet-3.0/lib
# qwt
QWT_PATH_INC = /usr/local/qwt-5.1.2-svn/include
QWT_PATH_LIB = /usr/local/qwt-5.1.2-svn/lib
QWT_PATH_INC = /opt/local/include
QWT_PATH_LIB = /opt/local/lib
# glew
GLEW_PATH_INC = /opt/local/include/GL
......@@ -89,7 +89,7 @@ USB_PATH_INC = /usr/local/include
USB_PATH_LIB = /usr/local/lib
# cholmod
CHM_PATH_INC = /usr/local/cholmod-1.7.0/include
CHM_PATH_INC = $${TOPDIR}/MacOS/Libs/cholmod
CHM_PATH_LIB = /usr/local/cholmod-1.7.0/lib
################################################################################
......@@ -140,12 +140,14 @@ defineTest( superlu ) {
defineTest( taucs ) {
exists ( $${TAUCS_PATH_INC}/taucs.h ) {
exists ( $${TAUCS_PATH_LIB}/libtaucs.a ) {
# exists ( $${TAUCS_PATH_LIB}/libtaucs.a ) {
lapack()
LIBS *= $${TAUCS_PATH_LIB}/libtaucs.a /opt/local/lib/libmetis.a
LIBS *= $${TAUCS_PATH_LIB}/libtaucs.a
LIBS *= /opt/local/lib/libmetis.a
export(LIBS)
INCLUDEPATH *= $${TAUCS_PATH_INC}
......@@ -153,7 +155,7 @@ defineTest( taucs ) {
return(true)
}
#}
} else {
message ( WARNING: taucs header files not found! )
}
......@@ -549,27 +551,23 @@ defineTest( usb ) {
defineTest( cholmod ) {
exists ( $${CHM_PATH_INC} ) {
addLib ( /usr/lib /sw/lib $${CHM_PATH_LIB}, cholmod ) {
addLib ( /usr/lib /sw/lib $${CHM_PATH_LIB}, colamd ) {
addLib ( /usr/lib /sw/lib $${CHM_PATH_LIB}, ccolamd ) {
addLib ( /usr/lib /sw/lib $${CHM_PATH_LIB}, camd ) {
addLib ( /usr/lib /sw/lib $${CHM_PATH_LIB}, amd ) {
addLib ( /usr/lib /sw/lib $${CHM_PATH_LIB}, metis ) {
addLib ( /usr/lib /sw/lib $${CHM_PATH_LIB}, lapack ) {
exists ( $${CHM_PATH_INC}/CHOLMOD/include ) {
INCLUDEPATH *= $${CHM_PATH_INC}
export(INCLUDEPATH)
return(true)
INCLUDEPATH *= $${CHM_PATH_INC}/UFconfig
LIBS *= $${TOPDIR}/MacOS/Libs/cholmod/CHOLMOD/Lib/libcholmod.a
LIBS *= $${TOPDIR}/MacOS/Libs/cholmod/AMD/Lib/libamd.a
LIBS *= $${TOPDIR}/MacOS/Libs/cholmod/CAMD/Lib/libcamd.a
LIBS *= $${TOPDIR}/MacOS/Libs/cholmod/CCOLAMD/Lib/libccolamd.a
LIBS *= $${TOPDIR}/MacOS/Libs/cholmod/COLAMD/Lib/libcolamd.a
INCLUDEPATH *= $${CHM_PATH_INC}/CHOLMOD/include
export(INCLUDEPATH)
export(LIBS)
return(true)
}
}
}
}
}
}
}
} else {
message ( WARNING: cholmod header files not found! )
}
......
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