removed old tetgen

CMakeLists.txt

@@ -86,7 +86,6 @@ opt(SOLVER "Enable built-in finite element solvers (required for compounds)" ${D
 opt(TAUCS "Enable Taucs linear solver" ${DEFAULT})
 opt(TCMALLOC "Enable libtcmalloc, a fast malloc implementation but that does not release memory" OFF)
 opt(TETGEN "Enable Tetgen 3D initial mesh generator" ${DEFAULT})
-opt(TETGEN_OLD "Enable older version of Tetgen" OFF)
 opt(VORO3D "Enable Voro3D (for hex meshing, experimental)" ${DEFAULT})
 opt(WRAP_JAVA "Enable generation of Java wrappers (experimental)" OFF)
 opt(WRAP_PYTHON "Enable generation of Python wrappers" OFF)
@@ -795,11 +794,6 @@ if(HAVE_MESH)
     include_directories(contrib/Tetgen1.5)
     set_config_option(HAVE_TETGEN "Tetgen(1.5)")
     add_definitions(-DTETLIBRARY)
-  elseif(ENABLE_TETGEN_OLD AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/Tetgen1.4/tetgen.h)
-    add_subdirectory(contrib/Tetgen1.4)
-    include_directories(contrib/Tetgen1.4)
-    set_config_option(HAVE_TETGEN "Tetgen(1.4)")
-    add_definitions(-DTETLIBRARY)
   elseif(ENABLE_TETGEN)
     find_library(TETGEN_LIB tet PATH_SUFFIXES lib)
     find_path(TETGEN_INC "tetgen.h" PATH_SUFFIXES src include tetgen)
@@ -811,7 +805,7 @@ if(HAVE_MESH)
   endif(ENABLE_TETGEN AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/Tetgen1.5/tetgen.h)
   if(HAVE_TETGEN)
     message(STATUS "Note: By including Tetgen you have to comply with Tetgen's "
-            "special licensing requirements stated in contrib/Tetgen*/LICENSE.")
+            "special licensing requirements stated in contrib/Tetgen1.5/LICENSE.")
   endif(HAVE_TETGEN)
 endif(HAVE_MESH)
 

contrib/Tetgen1.4/CMakeLists.txt

-# Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
-#
-# See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@onelab.info>.
-
-set(SRC
-  tetgen.cxx
-  predicates.cxx
-)
-
-file(GLOB_RECURSE HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h)
-append_gmsh_src(contrib/Tetgen1.4 "${SRC};${HDR}")

contrib/Tetgen1.4/LICENSE

-TetGen License
---------------
-
-The software (TetGen) is licensed under the terms of the  MIT  license
-with the following exceptions:
-
-Distribution of  modified  versions  of this code is permissible UNDER
-THE CONDITION THAT  THIS CODE AND ANY MODIFICATIONS  MADE TO IT IN THE
-SAME SOURCE FILES  tetgen.h AND tetgen.cxx  REMAIN UNDER  COPYRIGHT OF
-THE  ORIGINAL AUTHOR,  BOTH  SOURCE AND OBJECT  CODE  ARE MADE  FREELY
-AVAILABLE  WITHOUT   CHARGE,   AND  CLEAR   NOTICE  IS  GIVEN  OF  THE 
-MODIFICATIONS.
-
-Distribution of this code for  any  commercial purpose  is permissible
-ONLY BY DIRECT ARRANGEMENT WITH THE COPYRIGHT OWNER.
-
-The full  license text is reproduced below.
-
-This means that TetGen is no free software, but for private, research,
-and  educational purposes it  can be  used at  absolutely no  cost and
-without further arrangements.
-
-
-For details, see http://tetgen.berlios.de
-
-==============================================================================
-
-TetGen
-A Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator
-Version 1.4 (Released on January 14, 2006).
-
-Copyright 2002, 2004, 2005, 2006 
-Hang Si
-Rathausstr. 9, 10178 Berlin, Germany
-si@wias-berlin.de
-
-Permission is hereby granted, free  of charge, to any person obtaining
-a  copy  of this  software  and  associated  documentation files  (the
-"Software"), to  deal in  the Software without  restriction, including
-without limitation  the rights to  use, copy, modify,  merge, publish,
-distribute,  sublicense and/or  sell copies  of the  Software,  and to
-permit persons to whom the Software  is furnished to do so, subject to
-the following conditions:
-
-Distribution of  modified  versions  of this code is permissible UNDER
-THE CONDITION THAT  THIS CODE AND ANY MODIFICATIONS  MADE TO IT IN THE
-SAME SOURCE FILES  tetgen.h AND tetgen.cxx  REMAIN UNDER  COPYRIGHT OF
-THE  ORIGINAL AUTHOR,  BOTH  SOURCE AND OBJECT  CODE  ARE MADE  FREELY
-AVAILABLE  WITHOUT   CHARGE,   AND  CLEAR   NOTICE  IS  GIVEN  OF  THE 
-MODIFICATIONS.
-
-Distribution of this code for  any  commercial purpose  is permissible
-ONLY BY DIRECT ARRANGEMENT WITH THE COPYRIGHT OWNER.
-
-The  above  copyright  notice  and  this permission  notice  shall  be
-included in all copies or substantial portions of the Software.
-
-THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
-EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT  SHALL THE AUTHORS OR COPYRIGHT HOLDERS  BE LIABLE FOR ANY
-CLAIM, DAMAGES OR  OTHER LIABILITY, WHETHER IN AN  ACTION OF CONTRACT,
-TORT  OR OTHERWISE, ARISING  FROM, OUT  OF OR  IN CONNECTION  WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-==============================================================================
\ No newline at end of file

contrib/Tetgen1.4/README.txt

-This is TetGen version 1.4.2 (released on April 16, 2007)
-
-Please see the documentation of TetGen (available at the following link) for
-compiling and using TetGen.
-
-            http://tetgen.berlios.de/index.html
-
-TetGen may be freely copied, modified, and redistributed under the
-copyright notices stated in the file LICENSE.
-
-Please send bugs/comments to Hang Si <si@wias-berlin.de>
-
-Thank you and enjoy!
-
-Hang Si
-April 16, 2007