Skip to content
Snippets Groups Projects
Commit 47e1c394 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

thanks

parent 022e0d86
No related branches found
No related tags found
No related merge requests found
...@@ -748,6 +748,8 @@ if(HAVE_MESH OR HAVE_SOLVER) ...@@ -748,6 +748,8 @@ if(HAVE_MESH OR HAVE_SOLVER)
endif(HAVE_MESH OR HAVE_SOLVER) endif(HAVE_MESH OR HAVE_SOLVER)
if(HAVE_MESH) if(HAVE_MESH)
set_config_option(HAVE_TETGENBR "TetGen/BR")
if(ENABLE_VORO3D) if(ENABLE_VORO3D)
add_subdirectory(contrib/voro++) add_subdirectory(contrib/voro++)
include_directories(contrib/voro++/src) include_directories(contrib/voro++/src)
...@@ -792,7 +794,7 @@ if(HAVE_MESH) ...@@ -792,7 +794,7 @@ if(HAVE_MESH)
if(ENABLE_TETGEN AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/Tetgen1.5/tetgen.h) if(ENABLE_TETGEN AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/Tetgen1.5/tetgen.h)
add_subdirectory(contrib/Tetgen1.5) add_subdirectory(contrib/Tetgen1.5)
include_directories(contrib/Tetgen1.5) include_directories(contrib/Tetgen1.5)
set_config_option(HAVE_TETGEN "Tetgen(1.5)") set_config_option(HAVE_TETGEN "Tetgen1.5")
add_definitions(-DTETLIBRARY) add_definitions(-DTETLIBRARY)
elseif(ENABLE_TETGEN) elseif(ENABLE_TETGEN)
find_library(TETGEN_LIB tet PATH_SUFFIXES lib) find_library(TETGEN_LIB tet PATH_SUFFIXES lib)
...@@ -1315,7 +1317,7 @@ endif(NOWARN) ...@@ -1315,7 +1317,7 @@ endif(NOWARN)
check_cxx_compiler_flag("-O0" NOOPT) check_cxx_compiler_flag("-O0" NOOPT)
if(NOOPT) if(NOOPT)
file(GLOB_RECURSE NOOPT_SRC Mesh/BDS.cpp Parser/Gmsh.tab.cpp file(GLOB_RECURSE NOOPT_SRC Mesh/BDS.cpp Parser/Gmsh.tab.cpp
contrib/Tetgen*/predicates.cxx) contrib/Tetgen1.5/predicates.cxx)
foreach(FILE ${NOOPT_SRC}) foreach(FILE ${NOOPT_SRC})
get_source_file_property(PROP ${FILE} COMPILE_FLAGS) get_source_file_property(PROP ${FILE} COMPILE_FLAGS)
if(PROP) if(PROP)
......
...@@ -23,27 +23,27 @@ Bechet (solver), Gilles Marckmann (camera and stero mode), Ashish Negi ...@@ -23,27 +23,27 @@ Bechet (solver), Gilles Marckmann (camera and stero mode), Ashish Negi
(Salome/Netgen CAD healing), Trevor Strickler (structured/unstructured coupling (Salome/Netgen CAD healing), Trevor Strickler (structured/unstructured coupling
with pyramids), Amaury Johnen (Bezier), Benjamin Ruard (Java wrappers), Maxime with pyramids), Amaury Johnen (Bezier), Benjamin Ruard (Java wrappers), Maxime
Graulich (iOS/Android port), Francois Henrotte (onelab metamodels), Sebastian Graulich (iOS/Android port), Francois Henrotte (onelab metamodels), Sebastian
Eiser (PGF output), Alexis Salzman (compressed IO). See comments in the sources Eiser (PGF output), Alexis Salzman (compressed IO), Hang Si (TetGen/BR boundary
for more information. If we forgot to list your contributions please send us an recovery code). See comments in the sources for more information. If we forgot
email! to list your contributions please send us an email!
The TetGen/BR code (Mesh/tetgenBR.*) is copyright (c) 2016 Hang Si, Weierstrass The TetGen/BR code (Mesh/tetgenBR.{cpp,h}) is copyright (c) 2016 Hang Si, Weierstrass
Institute for Applied Analysis and Stochatics. Institute for Applied Analysis and Stochatics.
The AVL tree code (Common/avl.*) and the YUV image code (Graphics/gl2yuv.*) are The AVL tree code (Common/avl.{cpp,h}) and the YUV image code
copyright (C) 1988-1993, 1995 The Regents of the University of (Graphics/gl2yuv.{cpp,h}) are copyright (C) 1988-1993, 1995 The Regents of the
California. Permission to use, copy, modify, and distribute this software and University of California. Permission to use, copy, modify, and distribute this
its documentation for any purpose and without fee is hereby granted, provided software and its documentation for any purpose and without fee is hereby
that the above copyright notice appear in all copies and that both that granted, provided that the above copyright notice appear in all copies and that
copyright notice and this permission notice appear in supporting documentation, both that copyright notice and this permission notice appear in supporting
and that the name of the University of California not be used in advertising or documentation, and that the name of the University of California not be used in
publicity pertaining to distribution of the software without specific, written advertising or publicity pertaining to distribution of the software without
prior permission. The University of California makes no representations about specific, written prior permission. The University of California makes no
the suitability of this software for any purpose. It is provided "as is" without representations about the suitability of this software for any purpose. It is
express or implied warranty. provided "as is" without express or implied warranty.
The trackball code (Graphics/Trackball.*) is copyright (C) 1993, 1994, Silicon The trackball code (Graphics/Trackball.{cpp.h}) is copyright (C) 1993, 1994,
Graphics, Inc. ALL RIGHTS RESERVED. Permission to use, copy, modify, and Silicon Graphics, Inc. ALL RIGHTS RESERVED. Permission to use, copy, modify, and
distribute this software for any purpose and without fee is hereby granted, distribute this software for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that both the provided that the above copyright notice appear in all copies and that both the
copyright notice and this permission notice appear in supporting documentation, copyright notice and this permission notice appear in supporting documentation,
...@@ -93,7 +93,7 @@ configuration options. ...@@ -93,7 +93,7 @@ configuration options.
This version of Gmsh may contain code (in the contrib/Netgen subdirectory) This version of Gmsh may contain code (in the contrib/Netgen subdirectory)
copyright (C) 1994-2004 Joachim Sch"oberl: check the configuration options. copyright (C) 1994-2004 Joachim Sch"oberl: check the configuration options.
This version of Gmsh may contain code (in the contrib/Tetgen subdirectory) This version of Gmsh may contain code (in the contrib/Tetgen1.5 subdirectory)
copyright (C) 2002-2007 Hang Si: check the configuration options. copyright (C) 2002-2007 Hang Si: check the configuration options.
This version of Gmsh may contain code (in the contrib/Salome subdirectory) This version of Gmsh may contain code (in the contrib/Salome subdirectory)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment