Skip to content

Commit 6ed1ba8

Browse files
committed
Merge branch 'to-be-tested/Stop_testing_taucs-sloriot'
Taucs, Lapack and Blas supports are no longer tested Approved by the Release Manager Tested in CGAL-4.5-Ic-97 Conflicts: Polyhedron/demo/Polyhedron/CMakeLists.txt
2 parents ca5e5b1 + 073d007 commit 6ed1ba8

File tree

38 files changed

+48
-747
lines changed

38 files changed

+48
-747
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,6 @@ Point_set_processing_3/examples/Point_set_processing_3/normal_estimation
623623
Point_set_processing_3/examples/Point_set_processing_3/oni_copy.xyz
624624
Point_set_processing_3/examples/Point_set_processing_3/property_map
625625
Point_set_processing_3/examples/Point_set_processing_3/sphere_20k_copy.xyz
626-
Point_set_processing_3/include/CGAL/*.Taucs_symmetric_solver_traits
627626
Point_set_processing_3/include/CGAL/*.object_pool
628627
Point_set_processing_3/include/CGAL/*.pool
629628
Point_set_processing_3/include/CGAL/*.reserve_RAM
@@ -879,7 +878,6 @@ Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/APSS_re
879878
Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/AQtimeProject
880879
Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/Makefile
881880
Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/poisson_reconstruction
882-
Surface_reconstruction_points_3/include/CGAL/*.Taucs_symmetric_solver_traits
883881
Surface_reconstruction_points_3/include/CGAL/*.object_pool
884882
Surface_reconstruction_points_3/include/CGAL/*.pool
885883
Surface_reconstruction_points_3/include/CGAL/*.reserve_RAM

Documentation/doc/Documentation/Installation.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,7 @@ cmake -DWITH_examples=OFF -DWITH_demos=OFF -DCMAKE_BUILD_TYPE=Release
703703
-- Build type: Release
704704
-- USING CXXFLAGS = ' -frounding-math -O3 -DNDEBUG'
705705
-- USING LDFLAGS = ' '
706-
-- External libraries supported: GMP;GMPXX;MPFR;zlib;OpenGL;LEDA;MPFI;RS;RS3;OpenNL;TAUCS;EIGEN3;BLAS;LAPACK;QGLViewer;ESBTL;NTL
706+
-- External libraries supported: GMP;GMPXX;MPFR;zlib;OpenGL;LEDA;MPFI;RS;RS3;OpenNL;EIGEN3;BLAS;LAPACK;QGLViewer;ESBTL;NTL
707707
-- Preconfiguring library: GMP ...
708708
-- GMP has been preconfigured:
709709
-- CGAL_UseGMP-file:

Installation/CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ endmacro()
512512
# External libs Qt3 and Qt34are configured when Qt3 or Qt4 as lib of cgal are required
513513
# Coin is used in KDS, but no FindCoin or FindCOIN exists
514514
# There exists FindF2C, FindIPE, FindMKL, but they are only used to support supporting libs
515-
list (INSERT CGAL_SUPPORTING_3RD_PARTY_LIBRARIES 0 GMP MPFR ZLIB OpenGL LEDA MPFI RS RS3 OpenNL TAUCS Eigen3 BLAS LAPACK QGLViewer ESBTL Coin3D NTL IPE)
515+
list (INSERT CGAL_SUPPORTING_3RD_PARTY_LIBRARIES 0 GMP MPFR ZLIB OpenGL LEDA MPFI RS RS3 OpenNL Eigen3 BLAS LAPACK QGLViewer ESBTL Coin3D NTL IPE)
516516
if (NOT WIN32)
517517
# GMPXX is not supported on WIN32 machines
518518
list (INSERT CGAL_SUPPORTING_3RD_PARTY_LIBRARIES 1 GMPXX)
@@ -856,11 +856,6 @@ if ( GMP_IN_AUXILIARY )
856856
install(DIRECTORY auxiliary/gmp/lib/ DESTINATION ${CGAL_INSTALL_LIB_DIR} )
857857
endif()
858858

859-
if ( TAUCS_IN_AUXILIARY )
860-
install(DIRECTORY auxiliary/taucs/include/ DESTINATION ${CGAL_INSTALL_INC_DIR} )
861-
install(DIRECTORY auxiliary/taucs/lib/ DESTINATION ${CGAL_INSTALL_LIB_DIR} )
862-
endif()
863-
864859
if ( ZLIB_IN_AUXILIARY )
865860
install(DIRECTORY auxiliary/zlib/include/ DESTINATION ${CGAL_INSTALL_INC_DIR} )
866861
install(DIRECTORY auxiliary/zlib/lib/ DESTINATION ${CGAL_INSTALL_LIB_DIR} )

Installation/INSTALL

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,16 +95,6 @@ CGAL packages, some are only needed for demos.
9595
http://www.netlib.org/blas/, http://www.netlib.org/lapack/
9696
or precompiled version that can be downloaded with CGAL-x.y-Setup.exe
9797

98-
- TAUCS (sparse matrix solver)
99-
Required by the package (if EIGEN is not available):
100-
o Surface Reconstruction from Point Sets
101-
Accelerates the package:
102-
o Planar Parameterization of Triangulated Surface Meshes
103-
http://www.tau.ac.il/~stoledo/taucs/
104-
The version to used is available at
105-
https://gforge.inria.fr/frs/download.php/24628/taucs_full.tgz
106-
or automatically downloaded with CGAL-x.y-Setup.exe on Windows.
107-
10898
- MPFI
10999
Required by the package:
110100
o Algebraic Kernel

Installation/auxiliary/taucs/include/README

Lines changed: 0 additions & 2 deletions
This file was deleted.

Installation/auxiliary/taucs/lib/README

Lines changed: 0 additions & 2 deletions
This file was deleted.

Installation/config/support/print_TAUCS_version.cpp

Lines changed: 0 additions & 37 deletions
This file was deleted.

Installation/config/support/test_TAUCS.cpp

Lines changed: 0 additions & 96 deletions
This file was deleted.

Maintenance/test_handling/to_zipped_format

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,18 +84,9 @@ sub reformat_results($)
8484
if (/ZLIB_VERSION = '([^']+)'/) {
8585
$ZLIB="$1";
8686
}
87-
# if (/BLAS_VERSION = '([^']+)'/) {
88-
# $BLAS="+";
89-
# }
90-
# if (/LAPACK_VERSION = '([^']+)'/) {
91-
# $LAPACK="+";
92-
# }
9387
if (/OPENGL_VERSION = '([^']+)'/) {
9488
$OPENGL="$1";
9589
}
96-
# if (/TAUCS_VERSION = '([^']+)'/) {
97-
# $TAUCS="$1";
98-
# }
9990
if (/GMP_VERSION = '([^']+)'/) {
10091
$GMP="$1";
10192
}

Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ if ( CGAL_FOUND )
2727

2828
# VisualC++ optimization for applications dealing with large data
2929
if (MSVC)
30-
# Use /EHa option to catch stack overflows.
31-
# Note: TAUCS needs a stack >= 2MB. CGAL default is 10MB.
32-
string(REGEX REPLACE "/EH[asc]*" "/EHa" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
33-
3430
# Use /FR to turn on IntelliSense
3531
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /FR")
3632

0 commit comments

Comments
 (0)