Skip to content
Snippets Groups Projects
Commit 81197ba4 authored by Ansgar Burchardt's avatar Ansgar Burchardt
Browse files

CMake: set HAVE_BOOST_SERIALIZATION

It is used in several headers and at least one test, but was only
included in the autotools build system.
parent c21ff64e
Branches
No related tags found
No related merge requests found
...@@ -43,6 +43,8 @@ set(Python_ADDITIONAL_VERSIONS 2.7 3 3.2) ...@@ -43,6 +43,8 @@ set(Python_ADDITIONAL_VERSIONS 2.7 3 3.2)
find_package(PythonLibs) find_package(PythonLibs)
find_package(Adolc) find_package(Adolc)
find_package(Boost COMPONENTS serialization)
set(HAVE_BOOST_SERIALIZATION ${Boost_SERIALIZATION_FOUND})
include(AddPythonLibsFlags) include(AddPythonLibsFlags)
include(AddAdolcFlags) include(AddAdolcFlags)
...@@ -43,6 +43,9 @@ ...@@ -43,6 +43,9 @@
/* Define to 1 if adolc library is found */ /* Define to 1 if adolc library is found */
#cmakedefine HAVE_ADOLC 1 #cmakedefine HAVE_ADOLC 1
/* Define to 1 if Boost serialization library is found */
#cmakedefine HAVE_BOOST_SERIALIZATION 1
/* end dune-fufem /* end dune-fufem
Everything below here will be overwritten Everything below here will be overwritten
*/ */
...@@ -33,11 +33,8 @@ dune_add_test(SOURCES newpfeassemblertest.cc) ...@@ -33,11 +33,8 @@ dune_add_test(SOURCES newpfeassemblertest.cc)
dune_add_test(SOURCES pgmtest.cc) dune_add_test(SOURCES pgmtest.cc)
dune_add_test(SOURCES ppmtest.cc) dune_add_test(SOURCES ppmtest.cc)
dune_add_test(SOURCES refinedsimplexgeometrytest.cc) dune_add_test(SOURCES refinedsimplexgeometrytest.cc)
dune_add_test(SOURCES serializationtest.cc
SKIP_ON_77)
dune_add_test(SOURCES test-polyhedral-minimisation.cc) dune_add_test(SOURCES test-polyhedral-minimisation.cc)
set(TESTS ${GRID_BASED_TESTS}) set(TESTS ${GRID_BASED_TESTS})
# Setup targets, register tests, and add dune flags # Setup targets, register tests, and add dune flags
...@@ -79,6 +76,13 @@ if (ADOLC_FOUND) ...@@ -79,6 +76,13 @@ if (ADOLC_FOUND)
add_dune_adolc_flags(adolctest) add_dune_adolc_flags(adolctest)
endif() endif()
if(Boost_SERIALIZATION_FOUND)
dune_add_test(SOURCES serializationtest.cc
SKIP_ON_77)
set_property(TARGET serializationtest APPEND PROPERTY INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS})
target_link_libraries(serializationtest ${Boost_SERIALIZATION_LIBRARY})
endif()
if (HDF5_FOUND) if (HDF5_FOUND)
dune_add_test(SOURCES test-hdf5.cc) dune_add_test(SOURCES test-hdf5.cc)
set_property(TARGET test-hdf5 APPEND PROPERTY INCLUDE_DIRECTORIES ${HDF5_INCLUDE_DIR}) set_property(TARGET test-hdf5 APPEND PROPERTY INCLUDE_DIRECTORIES ${HDF5_INCLUDE_DIR})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment