[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] (no subject)
|
From: |
Yves Renard |
|
Subject: |
[Getfem-commits] (no subject) |
|
Date: |
Thu, 4 Apr 2019 15:12:28 -0400 (EDT) |
branch: master
commit 358e91241b13e796837415790717d1bcd4c1f1b3
Author: Yves Renard <address@hidden>
Date: Thu Apr 4 21:11:38 2019 +0200
further delete BOOST dependency
---
configure.ac | 33 ----------------------------
contrib/aposteriori/Makefile.am | 2 +-
contrib/bimaterial_crack_test/Makefile.am | 2 +-
contrib/crack_plate/Makefile.am | 2 +-
contrib/delaminated_crack/Makefile.am | 2 +-
contrib/icare/Makefile.am | 2 +-
contrib/level_set_contact/Makefile.am | 2 +-
contrib/mixed_elastostatic/Makefile.am | 2 +-
contrib/opt_assembly/Makefile.am | 2 +-
contrib/static_contact_gears/Makefile.am | 2 +-
contrib/xfem_contact/Makefile.am | 2 +-
contrib/xfem_stab_unilat_contact/Makefile.am | 2 +-
src/Makefile.am | 2 --
tests/Makefile.am | 2 +-
14 files changed, 12 insertions(+), 47 deletions(-)
diff --git a/configure.ac b/configure.ac
index 42632bc..2509644 100644
--- a/configure.ac
+++ b/configure.ac
@@ -779,39 +779,6 @@ AC_SUBST(DISTCLEANMESH)
dnl -----------------------------------------------
-dnl switch for using the getfem_boost supplied files, or the real boost
-dnl -----------------------------------------------
-
-AC_ARG_ENABLE(boost,
- [AS_HELP_STRING([--enable-boost],[check if boost is installed and use it])],
- [case "${enableval}" in
- yes) useboost=YES ;;
- no) useboost=NO ;;
- *) AC_MSG_ERROR([bad value ${enableval} for --enable-boost]) ;;
- esac],[useboost=NO])
-
-if test "x$useboost" = "xNO" -a "x$useopenmp" = "xYES"; then
- echo "OpenMP version of GetFEM++ requires the boost library,
--enable-boost=no will be ignored";
- useboost=YES
-fi;
-
-if test "x$useboost" = "xYES"; then
- if test "x$useopenmp" = "xYES"; then
- AX_BOOST_BASE([1.53.0], [], [AC_MSG_ERROR(
- [Please install boost >= 1.53.0 in order to build GetFEM++ with OpenMP
support])])
- AX_BOOST_SYSTEM
- AX_BOOST_THREAD
- else
- AX_BOOST_BASE([1.20.0], [], [AC_MSG_ERROR(
- [Please install boost >= 1.20.0 (system) or use --enable-boost=no to
disable it])])
- AX_BOOST_SYSTEM
- fi;
- BOOST_LIBS="$BOOST_SYSTEM_LIB $BOOST_THREAD_LIB"
- AC_SUBST(BOOST_LIBS)
-fi;
-
-
-dnl -----------------------------------------------
dnl MATLAB Interface
dnl -----------------------------------------------
diff --git a/contrib/aposteriori/Makefile.am b/contrib/aposteriori/Makefile.am
index da5a1fd..a263634 100644
--- a/contrib/aposteriori/Makefile.am
+++ b/contrib/aposteriori/Makefile.am
@@ -25,7 +25,7 @@ aposteriori_SOURCES = aposteriori.cc
aposteriori_laplacian_SOURCES = aposteriori_laplacian.cc
AM_CPPFLAGS = -I$(top_srcdir)/src -I../../src
-LDADD = ../../src/libgetfem.la -lm @SUPLDFLAGS@ @BOOST_LIBS@
+LDADD = ../../src/libgetfem.la -lm @SUPLDFLAGS@
TESTS = aposteriori.pl \
aposteriori_laplacian.pl
diff --git a/contrib/bimaterial_crack_test/Makefile.am
b/contrib/bimaterial_crack_test/Makefile.am
index 395ea4c..6a0b341 100644
--- a/contrib/bimaterial_crack_test/Makefile.am
+++ b/contrib/bimaterial_crack_test/Makefile.am
@@ -28,7 +28,7 @@ crack_SOURCES = crack.cc crack_exact_solution.cc
crack_exact_solution.h getfem_X
AM_CPPFLAGS = -I$(top_srcdir)/src -I../../src
-LDADD = ../../src/libgetfem.la -lm @SUPLDFLAGS@ @BOOST_LIBS@
+LDADD = ../../src/libgetfem.la -lm @SUPLDFLAGS@
TESTS = bimaterial_crack_test.pl \
crack.pl
diff --git a/contrib/crack_plate/Makefile.am b/contrib/crack_plate/Makefile.am
index bb63180..4114725 100644
--- a/contrib/crack_plate/Makefile.am
+++ b/contrib/crack_plate/Makefile.am
@@ -31,7 +31,7 @@ crack_bilaplacian_SOURCES = crack_bilaplacian.cc
crack_bilaplacian_singularities
endif
AM_CPPFLAGS = -I$(top_srcdir)/src -I../../src
-LDADD = ../../src/libgetfem.la -lm @SUPLDFLAGS@ @BOOST_LIBS@
+LDADD = ../../src/libgetfem.la -lm @SUPLDFLAGS@
if QHULL
TESTS = crack_mindlin.pl
diff --git a/contrib/delaminated_crack/Makefile.am
b/contrib/delaminated_crack/Makefile.am
index 8274dc3..8611651 100644
--- a/contrib/delaminated_crack/Makefile.am
+++ b/contrib/delaminated_crack/Makefile.am
@@ -25,7 +25,7 @@ CLEANFILES =
delaminated_crack_SOURCES = delaminated_crack.cc
AM_CPPFLAGS = -I$(top_srcdir)/src -I../../src
-LDADD = ../../src/libgetfem.la -lm @SUPLDFLAGS@ @BOOST_LIBS@
+LDADD = ../../src/libgetfem.la -lm @SUPLDFLAGS@
TESTS = delaminated_crack.pl
diff --git a/contrib/icare/Makefile.am b/contrib/icare/Makefile.am
index 2f171b8..8d037a7 100644
--- a/contrib/icare/Makefile.am
+++ b/contrib/icare/Makefile.am
@@ -27,7 +27,7 @@ icare_SOURCES = icare.cc icare.h
MUMPS_LIBS = @MUMPS_LIBS@
# MUMPS_CFLAGS = @MUMPS_CFLAGS@
AM_CPPFLAGS = -I$(top_srcdir)/src -I../../src # $(MUMPS_CFLAGS)
-LDADD = ../../src/libgetfem.la -lm $(MUMPS_LIBS) @SUPLDFLAGS@ @BOOST_LIBS@
+LDADD = ../../src/libgetfem.la -lm $(MUMPS_LIBS) @SUPLDFLAGS@
TESTS = icare.pl
diff --git a/contrib/level_set_contact/Makefile.am
b/contrib/level_set_contact/Makefile.am
index 33935eb..133b2ec 100755
--- a/contrib/level_set_contact/Makefile.am
+++ b/contrib/level_set_contact/Makefile.am
@@ -28,7 +28,7 @@ CLEANFILES = \
test_contact_SOURCES = contact_problem.cpp test_contact.cpp contact_problem.h
AM_CPPFLAGS = -I$(top_srcdir)/src -I../../src
-LDADD = ../../src/libgetfem.la -lm @SUPLDFLAGS@ @BOOST_LIBS@
+LDADD = ../../src/libgetfem.la -lm @SUPLDFLAGS@
TESTS = contact_problem.pl
diff --git a/contrib/mixed_elastostatic/Makefile.am
b/contrib/mixed_elastostatic/Makefile.am
index 681c40a..399373c 100644
--- a/contrib/mixed_elastostatic/Makefile.am
+++ b/contrib/mixed_elastostatic/Makefile.am
@@ -25,7 +25,7 @@ CLEANFILES =
mixed_elastostatic_SOURCES = mixed_elastostatic.cc
AM_CPPFLAGS = -I$(top_srcdir)/src -I../../src
-LDADD = ../../src/libgetfem.la -lm @SUPLDFLAGS@ @BOOST_LIBS@
+LDADD = ../../src/libgetfem.la -lm @SUPLDFLAGS@
TESTS = mixed_elastostatic.pl
diff --git a/contrib/opt_assembly/Makefile.am b/contrib/opt_assembly/Makefile.am
index 73dfc49..edd8e41 100644
--- a/contrib/opt_assembly/Makefile.am
+++ b/contrib/opt_assembly/Makefile.am
@@ -22,7 +22,7 @@ CLEANFILES =
opt_assembly_SOURCES = opt_assembly.cc
AM_CPPFLAGS = -I$(top_srcdir)/src -I../../src
-LDADD = ../../src/libgetfem.la -lm @SUPLDFLAGS@ @BOOST_LIBS@
+LDADD = ../../src/libgetfem.la -lm @SUPLDFLAGS@
TESTS = opt_assembly.pl
diff --git a/contrib/static_contact_gears/Makefile.am
b/contrib/static_contact_gears/Makefile.am
index f75d8aa..fd92c81 100755
--- a/contrib/static_contact_gears/Makefile.am
+++ b/contrib/static_contact_gears/Makefile.am
@@ -30,7 +30,7 @@ static_contact_gears_SOURCES = static_contact_gears.cc
static_contact_gears_u1_u2_SOURCES = static_contact_gears_u1_u2.cc
AM_CPPFLAGS = -I$(top_srcdir)/src -I../../src
-LDADD = ../../src/libgetfem.la -lm @SUPLDFLAGS@ @BOOST_LIBS@
+LDADD = ../../src/libgetfem.la -lm @SUPLDFLAGS@
TESTS = static_contact_gears.pl
diff --git a/contrib/xfem_contact/Makefile.am b/contrib/xfem_contact/Makefile.am
index 313e28f..c98775f 100644
--- a/contrib/xfem_contact/Makefile.am
+++ b/contrib/xfem_contact/Makefile.am
@@ -32,7 +32,7 @@ endif
xfem_stokes_SOURCES = xfem_stokes.cc
AM_CPPFLAGS = -I$(top_srcdir)/src -I../../src
-LDADD = ../../src/libgetfem.la -lm @SUPLDFLAGS@ @BOOST_LIBS@
+LDADD = ../../src/libgetfem.la -lm @SUPLDFLAGS@
TESTS = xfem_contact.pl
diff --git a/contrib/xfem_stab_unilat_contact/Makefile.am
b/contrib/xfem_stab_unilat_contact/Makefile.am
index 20b93d5..4eedae3 100644
--- a/contrib/xfem_stab_unilat_contact/Makefile.am
+++ b/contrib/xfem_stab_unilat_contact/Makefile.am
@@ -24,7 +24,7 @@ CLEANFILES =
xfem_stab_unilat_contact_SOURCES = xfem_stab_unilat_contact.cc
AM_CPPFLAGS = -I$(top_srcdir)/src -I../../src
-LDADD = ../../src/libgetfem.la -lm @SUPLDFLAGS@ @BOOST_LIBS@
+LDADD = ../../src/libgetfem.la -lm @SUPLDFLAGS@
TESTS = xfem_stab_unilat_contact.pl
diff --git a/src/Makefile.am b/src/Makefile.am
index b5ad805..69260f1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,8 +16,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
nobase_include_HEADERS = \
- getfem_boost/workaround.hpp \
- getfem_boost/noncopyable.hpp \
gmm/gmm.h \
gmm/gmm_arch_config.h \
gmm/gmm_matrix.h \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 76eb7b2..73883c4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -120,7 +120,7 @@ test_continuation_SOURCES = test_continuation.cc
test_gmm_matrix_functions_SOURCES = test_gmm_matrix_functions.cc
AM_CPPFLAGS = -I$(top_srcdir)/src -I../src
-LDADD = ../src/libgetfem.la -lm @SUPLDFLAGS@ @BOOST_LIBS@
+LDADD = ../src/libgetfem.la -lm @SUPLDFLAGS@
TESTS = \
dynamic_array.pl \