From b9c4adff9e2454632fc47dc3d129ce4cfc0ec9bc Mon Sep 17 00:00:00 2001 From: Roland Kaufmann Date: Sat, 7 Sep 2013 23:11:32 +0200 Subject: [PATCH] Depend on Boost::iostreams The benchmark library uses Boost::iostreams to do decompression. Since we only scan for the Boost dependency once, this submodule is added to all of the projects in order to have a coherent dependency on Boost. --- cmake/Modules/dune-cornerpoint-prereqs.cmake | 2 +- cmake/Modules/opm-autodiff-prereqs.cmake | 2 +- cmake/Modules/opm-benchmarks-prereqs.cmake | 3 ++ cmake/Modules/opm-core-prereqs.cmake | 52 ++++++++++---------- cmake/Modules/opm-polymer-prereqs.cmake | 2 +- cmake/Modules/opm-porsol-prereqs.cmake | 2 +- cmake/Modules/opm-upscaling-prereqs.cmake | 2 +- cmake/Modules/opm-verteq-prereqs.cmake | 2 +- 8 files changed, 34 insertions(+), 33 deletions(-) diff --git a/cmake/Modules/dune-cornerpoint-prereqs.cmake b/cmake/Modules/dune-cornerpoint-prereqs.cmake index c7a0a358a..5b03c33ba 100644 --- a/cmake/Modules/dune-cornerpoint-prereqs.cmake +++ b/cmake/Modules/dune-cornerpoint-prereqs.cmake @@ -16,7 +16,7 @@ set (dune-cornerpoint_DEPS "CXX11Features" # various runtime library enhancements "Boost 1.39.0 - COMPONENTS date_time filesystem system unit_test_framework REQUIRED" + COMPONENTS date_time filesystem system iostreams unit_test_framework REQUIRED" # DUNE dependency "dune-common REQUIRED; dune-grid REQUIRED; diff --git a/cmake/Modules/opm-autodiff-prereqs.cmake b/cmake/Modules/opm-autodiff-prereqs.cmake index 86fad9a34..f83413dfb 100644 --- a/cmake/Modules/opm-autodiff-prereqs.cmake +++ b/cmake/Modules/opm-autodiff-prereqs.cmake @@ -13,7 +13,7 @@ set (opm-autodiff_DEPS "CXX11Features" # Various runtime library enhancements "Boost 1.39.0 - COMPONENTS date_time filesystem system unit_test_framework REQUIRED" + COMPONENTS date_time filesystem system iostreams unit_test_framework REQUIRED" # DUNE prerequisites "dune-common REQUIRED; dune-istl REQUIRED; diff --git a/cmake/Modules/opm-benchmarks-prereqs.cmake b/cmake/Modules/opm-benchmarks-prereqs.cmake index 7b754d967..465d10e5e 100644 --- a/cmake/Modules/opm-benchmarks-prereqs.cmake +++ b/cmake/Modules/opm-benchmarks-prereqs.cmake @@ -9,6 +9,9 @@ set (opm-benchmarks_CONFIG_VAR set (opm-benchmarks_DEPS # compile with C++0x/11 support if available "CXX11Features REQUIRED" + # various runtime library enhancements + "Boost 1.39.0 + COMPONENTS date_time filesystem system iostreams unit_test_framework REQUIRED" # OPM dependency "opm-core" "opm-upscaling" diff --git a/cmake/Modules/opm-core-prereqs.cmake b/cmake/Modules/opm-core-prereqs.cmake index 41419b15a..fb7b37c6d 100644 --- a/cmake/Modules/opm-core-prereqs.cmake +++ b/cmake/Modules/opm-core-prereqs.cmake @@ -3,33 +3,31 @@ # defines that must be present in config.h for our headers set (opm-core_CONFIG_VAR - HAVE_ERT - HAVE_SUITESPARSE_UMFPACK_H - ) + HAVE_ERT + HAVE_SUITESPARSE_UMFPACK_H + ) # dependencies set (opm-core_DEPS - # compile with C99 support if available - "C99" - # compile with C++0x/11 support if available - "CXX11Features REQUIRED" - # various runtime library enhancements - "Boost 1.44.0 - COMPONENTS date_time filesystem system unit_test_framework REQUIRED" - # matrix library - "BLAS REQUIRED" - "LAPACK REQUIRED" - # Tim Davis' SuiteSparse archive - "SuiteSparse COMPONENTS umfpack" - # solver - "SuperLU" - # xml processing (for config parsing) - "TinyXML" - #Parser library - "opm-parser REQUIRED" - # Ensembles-based Reservoir Tools (ERT) - "ERT" - # DUNE dependency - "dune-common" - "dune-istl" - ) + # compile with C99 support if available + "C99" + # compile with C++0x/11 support if available + "CXX11Features REQUIRED" + # various runtime library enhancements + "Boost 1.39.0 + COMPONENTS date_time filesystem system iostreams unit_test_framework REQUIRED" + # matrix library + "BLAS REQUIRED" + "LAPACK REQUIRED" + # Tim Davis' SuiteSparse archive + "SuiteSparse COMPONENTS umfpack" + # solver + "SuperLU" + # xml processing (for config parsing) + "TinyXML" + # Ensembles-based Reservoir Tools (ERT) + "ERT" + # DUNE dependency + "dune-common" + "dune-istl" + ) diff --git a/cmake/Modules/opm-polymer-prereqs.cmake b/cmake/Modules/opm-polymer-prereqs.cmake index e34a37de3..68f52ec01 100644 --- a/cmake/Modules/opm-polymer-prereqs.cmake +++ b/cmake/Modules/opm-polymer-prereqs.cmake @@ -13,7 +13,7 @@ set (opm-polymer_DEPS "CXX11Features" # various runtime library enhancements "Boost 1.39.0 - COMPONENTS date_time filesystem system unit_test_framework REQUIRED" + COMPONENTS date_time filesystem system iostreams unit_test_framework REQUIRED" # Ensembles-based Reservoir Tools "ERT" # OPM dependency diff --git a/cmake/Modules/opm-porsol-prereqs.cmake b/cmake/Modules/opm-porsol-prereqs.cmake index 01280c7c3..cc0b192b5 100644 --- a/cmake/Modules/opm-porsol-prereqs.cmake +++ b/cmake/Modules/opm-porsol-prereqs.cmake @@ -13,7 +13,7 @@ set (opm-porsol_DEPS "CXX11Features" # various runtime library enhancements "Boost 1.39.0 - COMPONENTS date_time filesystem system unit_test_framework REQUIRED" + COMPONENTS date_time filesystem system iostreams unit_test_framework REQUIRED" # DUNE dependency "dune-common REQUIRED; dune-istl REQUIRED; diff --git a/cmake/Modules/opm-upscaling-prereqs.cmake b/cmake/Modules/opm-upscaling-prereqs.cmake index c55bc130b..b6f42eed3 100644 --- a/cmake/Modules/opm-upscaling-prereqs.cmake +++ b/cmake/Modules/opm-upscaling-prereqs.cmake @@ -14,7 +14,7 @@ set (opm-upscaling_DEPS "CXX11Features" # various runtime library enhancements "Boost 1.39.0 - COMPONENTS date_time filesystem system unit_test_framework REQUIRED" + COMPONENTS date_time filesystem system iostreams unit_test_framework REQUIRED" # matrix library "BLAS REQUIRED" "LAPACK REQUIRED" diff --git a/cmake/Modules/opm-verteq-prereqs.cmake b/cmake/Modules/opm-verteq-prereqs.cmake index 6b3b74419..1b111a2ef 100644 --- a/cmake/Modules/opm-verteq-prereqs.cmake +++ b/cmake/Modules/opm-verteq-prereqs.cmake @@ -13,7 +13,7 @@ set (opm-verteq_DEPS "CXX11Features" # various runtime library enhancements "Boost 1.39.0 - COMPONENTS date_time filesystem system unit_test_framework REQUIRED" + COMPONENTS date_time filesystem system iostreams unit_test_framework REQUIRED" # OPM dependency "opm-core" )