From 453402d72a006b36c94531cb8d3eb87f27497b02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <gruenich@dune-project.org> Date: Thu, 3 Sep 2015 17:52:00 +0200 Subject: [PATCH] Remove remaining Boost-related artifacts Boost is no longer needed in dune-istl. --- cmake/modules/DuneIstlMacros.cmake | 2 -- config.h.cmake | 6 ------ dune/istl/tutorial/CMakeLists.txt | 1 - dune/istl/tutorial/Makefile.am | 2 +- m4/dune_istl.m4 | 2 -- 5 files changed, 1 insertion(+), 12 deletions(-) diff --git a/cmake/modules/DuneIstlMacros.cmake b/cmake/modules/DuneIstlMacros.cmake index 65414e59e..a01def74a 100644 --- a/cmake/modules/DuneIstlMacros.cmake +++ b/cmake/modules/DuneIstlMacros.cmake @@ -1,5 +1,3 @@ -include(DuneBoost) -find_package(BoostFusion) find_package(METIS) find_package(ParMETIS) include(AddParMETISFlags) diff --git a/config.h.cmake b/config.h.cmake index 30043b2b7..d419a47cf 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -28,12 +28,6 @@ /* end private */ -/* define if the Boost::Fusion headers are available */ -#cmakedefine HAVE_BOOST_FUSION - -/* Define to ENABLE_BOOST if the Boost library is available */ -#cmakedefine HAVE_BOOST ENABLE_BOOST - /* Define to ENABLE_SUPERLU if the SuperLU library is available */ #cmakedefine HAVE_SUPERLU ENABLE_SUPERLU diff --git a/dune/istl/tutorial/CMakeLists.txt b/dune/istl/tutorial/CMakeLists.txt index 3b6f93928..b9775a1db 100644 --- a/dune/istl/tutorial/CMakeLists.txt +++ b/dune/istl/tutorial/CMakeLists.txt @@ -1,4 +1,3 @@ add_executable(example "example.cc") add_dune_mpi_flags(example) -add_dune_boost_flags(example) target_link_libraries(example "dunecommon") diff --git a/dune/istl/tutorial/Makefile.am b/dune/istl/tutorial/Makefile.am index e63125f87..2cacdf66c 100644 --- a/dune/istl/tutorial/Makefile.am +++ b/dune/istl/tutorial/Makefile.am @@ -2,7 +2,7 @@ dist_noinst_DATA = example.cc noinst_PROGRAMS = example example_SOURCES = example.cc -example_CPPFLAGS = $(AM_CPPFLAGS) $(BOOST_CPPFLAGS) $(DUNE_CPPFLAGS) +example_CPPFLAGS = $(AM_CPPFLAGS) $(DUNE_CPPFLAGS) include $(top_srcdir)/am/global-rules diff --git a/m4/dune_istl.m4 b/m4/dune_istl.m4 index 10b61d944..b076f319d 100644 --- a/m4/dune_istl.m4 +++ b/m4/dune_istl.m4 @@ -10,8 +10,6 @@ AC_DEFUN([DUNE_ISTL_CHECKS], AC_REQUIRE([__AC_FC_NAME_MANGLING]) AC_REQUIRE([AC_PROG_F77]) AC_REQUIRE([ACX_BLAS]) - AC_REQUIRE([DUNE_BOOST_BASE]) - DUNE_BOOST_BASE(, [ DUNE_BOOST_FUSION ] , [] ) # add summary entries for tests not maintained by dune DUNE_ADD_SUMMARY_ENTRY([METIS],[$with_metis]) -- GitLab