songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Link with BLAS, LAPACK and TAUCS using CGAL_UseTAUCS.cmake

This commit is contained in:
Laurent Saboret 2008-11-04 11:06:31 +00:00
parent 8ec64344ea
commit 74d29f695a
3 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Polyhedron/demo/Polyhedron/CMakeLists.txt
View File

@ -45,18 +45,14 @@ if(QT_FOUND)
find_package(QGLViewer QUIET ) find_package(QGLViewer QUIET )
endif(QT_FOUND) endif(QT_FOUND)
# Find TAUCS (optionnal) # Link with BLAS, LAPACK and TAUCS (optional)
find_package(TAUCS QUIET) include( CGAL_UseTAUCS )
if (NOT TAUCS_FOUND)
message(STATUS "warning: TAUCS is not found. parameterization will not be available.")
endif(TAUCS_FOUND)
if(CGAL_Qt4_FOUND AND Boost_FOUND AND Boost_THREAD_FOUND AND QT_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) if(CGAL_Qt4_FOUND AND Boost_FOUND AND Boost_THREAD_FOUND AND QT_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)
if(TAUCS_FOUND)
include_directories( ${TAUCS_INCLUDE_DIR} )
add_definitions(-DCGAL_TAUCS_ENABLED)
else(TAUCS_FOUND)
message(STATUS "warning: TAUCS is not found. parametrization will not be available.")
endif(TAUCS_FOUND)
qt4_wrap_ui( UI_FILES MainWindow.ui ) qt4_wrap_ui( UI_FILES MainWindow.ui )
include(AddFileDependencies) include(AddFileDependencies)
@ -117,18 +113,6 @@ if(CGAL_Qt4_FOUND AND Boost_FOUND AND Boost_THREAD_FOUND AND QT_FOUND AND OPENGL
# Link with libQGLViewer, OpenGL # Link with libQGLViewer, OpenGL
target_link_libraries( Polyhedron_3 ${QGLVIEWER_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) target_link_libraries( Polyhedron_3 ${QGLVIEWER_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} )
if(TAUCS_FOUND)
# Link with TAUCS
link_directories(Polyhedron_3 ${TAUCS_LIBRARIES_DIR})
target_link_libraries(Polyhedron_3 ${TAUCS_LIBRARIES})
endif(TAUCS_FOUND)
# Blas and Lapack, under Linux
if( NOT CGAL_AUTO_LINK_ENABLED )
add_definitions( -DCGAL_USE_F2C )
target_link_libraries( Polyhedron_3 lapack blas )
endif()
else (CGAL_Qt4_FOUND AND Boost_FOUND AND Boost_THREAD_FOUND AND QT_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) else (CGAL_Qt4_FOUND AND Boost_FOUND AND Boost_THREAD_FOUND AND QT_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)
set(POLYHEDRON_MISSING_DEPS "") set(POLYHEDRON_MISSING_DEPS "")

2
Polyhedron/demo/Polyhedron/MainWindow.h
View File

@ -100,7 +100,7 @@ protected:
// defined in MainWindow_boolean_operations.cpp // defined in MainWindow_boolean_operations.cpp
void boolean_operation(const Boolean_operation operation); void boolean_operation(const Boolean_operation operation);
#ifdef CGAL_TAUCS_ENABLED #ifdef CGAL_USE_TAUCS
enum Parameterization_method { PARAM_MVC, enum Parameterization_method { PARAM_MVC,
PARAM_DCP}; PARAM_DCP};
// defined in MainWindow_parameterization.cpp // defined in MainWindow_parameterization.cpp

6
Polyhedron/demo/Polyhedron/MainWindow_parameterization.cpp
View File

@ -1,4 +1,4 @@
#ifdef CGAL_TAUCS_ENABLED #ifdef CGAL_USE_TAUCS
#include <QApplication> #include <QApplication>
#include <QTime> #include <QTime>
@ -106,7 +106,7 @@ void MainWindow::on_actionDCP_triggered()
parameterize(PARAM_DCP); parameterize(PARAM_DCP);
} }
#else // #ifdef CGAL_TAUCS_ENABLED #else // #ifdef CGAL_USE_TAUCS
void MainWindow::on_actionMVC_triggered() void MainWindow::on_actionMVC_triggered()
{ {
@ -116,4 +116,4 @@ void MainWindow::on_actionDCP_triggered()
{ {
} }
#endif // #ifdef CGAL_TAUCS_ENABLED #endif // #ifdef CGAL_USE_TAUCS