From 8a8db8aa14c1595a2f3425e5bd5f3ede10b1e681 Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Mon, 1 Jun 2009 21:40:34 +0000 Subject: [PATCH] *** empty log message *** --- Makefile | 4 ++-- configure | 12 +++++++++++- configure.in | 10 +++++++--- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 8354b514ea..d26d7858ce 100644 --- a/Makefile +++ b/Makefile @@ -26,14 +26,14 @@ GMSH_API =\ Geo/MTetrahedron.h Geo/MHexahedron.h Geo/MPrism.h Geo/MPyramid.h\ Geo/discreteVertex.h Geo/discreteEdge.h Geo/discreteFace.h Geo/discreteRegion.h\ Geo/SPoint2.h Geo/SPoint3.h Geo/SVector3.h Geo/SBoundingBox3d.h Geo/Pair.h Geo/Range.h\ - Geo/CellComplex.h\ - Geo/ChainComplex.h\ + Geo/CellComplex.h Geo/ChainComplex.h\ contrib/kbipack/gmp_normal_form.h contrib/kbipack/gmp_matrix.h contrib/kbipack/gmp_blas.h\ Numeric/Gauss.h Numeric/FunctionSpace.h Numeric/GmshMatrix.h\ Numeric/gmshAssembler.h Numeric/gmshTermOfFormulation.h Numeric/gmshLaplace.h\ Numeric/gmshElasticity.h Numeric/gmshLinearSystem.h Numeric/gmshLinearSystemGmm.h\ Numeric/gmshLinearSystemFull.h Numeric/gmshFunction.h\ Post/PView.h Post/PViewData.h Plugin/PluginManager.h\ + Graphics/drawContext.h\ Common/VertexArray.h Common/GmshMessage.h\ Common/Gmsh.h Common/GmshConfig.h Common/GmshDefines.h Common/GmshVersion.h diff --git a/configure b/configure index e201f690b8..974e069c33 100755 --- a/configure +++ b/configure @@ -1292,7 +1292,7 @@ Optional Features: Linux) --enable-tree-browser enable tree browser (default=yes) --enable-mpi enable MPI support (default=no) - --enable-minimal build minimal standalone version (default=no) + Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1972,6 +1972,11 @@ if test "${enable_mpi+set}" = set; then enableval=$enable_mpi; fi +# Check whether --enable-graphics was given. +if test "${enable_graphics+set}" = set; then + enableval=$enable_graphics; +fi + # Check whether --enable-minimal was given. if test "${enable_minimal+set}" = set; then enableval=$enable_minimal; @@ -4237,6 +4242,11 @@ _ACEOF BO="${BO} NoParser" fi + if test "x$enable_graphics" = "xyes"; then + GMSH_DIRS="${GMSH_DIRS} Graphics" + GMSH_LIBS="${GMSH_LIBS} -lGmshGraphics" + fi + GMSH_DIRS="${GMSH_DIRS} Numeric" GMSH_LIBS="${GMSH_LIBS} -lGmshCommon -lGmshNumeric" diff --git a/configure.in b/configure.in index ae44ce5a4f..5a4c54d3ff 100644 --- a/configure.in +++ b/configure.in @@ -145,9 +145,8 @@ AC_ARG_ENABLE(tree-browser, AC_ARG_ENABLE(mpi, AC_HELP_STRING([--enable-mpi], [enable MPI support (default=no)])) -AC_ARG_ENABLE(minimal, - AC_HELP_STRING([--enable-minimal], - [build minimal standalone version (default=no)])) +AC_ARG_ENABLE(graphics) +AC_ARG_ENABLE(minimal) dnl "minimal" build shortcut if test "x$enable_minimal" = "xyes"; then @@ -394,6 +393,11 @@ else BO="${BO} NoParser" fi + if test "x$enable_graphics" = "xyes"; then + GMSH_DIRS="${GMSH_DIRS} Graphics" + GMSH_LIBS="${GMSH_LIBS} -lGmshGraphics" + fi + dnl re-add Common to work around linker shortcomings on some archs GMSH_DIRS="${GMSH_DIRS} Numeric" GMSH_LIBS="${GMSH_LIBS} -lGmshCommon -lGmshNumeric" -- GitLab