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.
This commit is contained in:
Roland Kaufmann 2013-09-07 23:11:32 +02:00 committed by Bård Skaflestad
parent cd9012152d
commit b9c4adff9e
8 changed files with 34 additions and 33 deletions

View File

@ -16,7 +16,7 @@ set (dune-cornerpoint_DEPS
"CXX11Features" "CXX11Features"
# various runtime library enhancements # various runtime library enhancements
"Boost 1.39.0 "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 dependency
"dune-common REQUIRED; "dune-common REQUIRED;
dune-grid REQUIRED; dune-grid REQUIRED;

View File

@ -13,7 +13,7 @@ set (opm-autodiff_DEPS
"CXX11Features" "CXX11Features"
# Various runtime library enhancements # Various runtime library enhancements
"Boost 1.39.0 "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 prerequisites
"dune-common REQUIRED; "dune-common REQUIRED;
dune-istl REQUIRED; dune-istl REQUIRED;

View File

@ -9,6 +9,9 @@ set (opm-benchmarks_CONFIG_VAR
set (opm-benchmarks_DEPS set (opm-benchmarks_DEPS
# compile with C++0x/11 support if available # compile with C++0x/11 support if available
"CXX11Features REQUIRED" "CXX11Features REQUIRED"
# various runtime library enhancements
"Boost 1.39.0
COMPONENTS date_time filesystem system iostreams unit_test_framework REQUIRED"
# OPM dependency # OPM dependency
"opm-core" "opm-core"
"opm-upscaling" "opm-upscaling"

View File

@ -3,33 +3,31 @@
# defines that must be present in config.h for our headers # defines that must be present in config.h for our headers
set (opm-core_CONFIG_VAR set (opm-core_CONFIG_VAR
HAVE_ERT HAVE_ERT
HAVE_SUITESPARSE_UMFPACK_H HAVE_SUITESPARSE_UMFPACK_H
) )
# dependencies # dependencies
set (opm-core_DEPS set (opm-core_DEPS
# compile with C99 support if available # compile with C99 support if available
"C99" "C99"
# compile with C++0x/11 support if available # compile with C++0x/11 support if available
"CXX11Features REQUIRED" "CXX11Features REQUIRED"
# various runtime library enhancements # various runtime library enhancements
"Boost 1.44.0 "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 # matrix library
"BLAS REQUIRED" "BLAS REQUIRED"
"LAPACK REQUIRED" "LAPACK REQUIRED"
# Tim Davis' SuiteSparse archive # Tim Davis' SuiteSparse archive
"SuiteSparse COMPONENTS umfpack" "SuiteSparse COMPONENTS umfpack"
# solver # solver
"SuperLU" "SuperLU"
# xml processing (for config parsing) # xml processing (for config parsing)
"TinyXML" "TinyXML"
#Parser library # Ensembles-based Reservoir Tools (ERT)
"opm-parser REQUIRED" "ERT"
# Ensembles-based Reservoir Tools (ERT) # DUNE dependency
"ERT" "dune-common"
# DUNE dependency "dune-istl"
"dune-common" )
"dune-istl"
)

View File

@ -13,7 +13,7 @@ set (opm-polymer_DEPS
"CXX11Features" "CXX11Features"
# various runtime library enhancements # various runtime library enhancements
"Boost 1.39.0 "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 # Ensembles-based Reservoir Tools
"ERT" "ERT"
# OPM dependency # OPM dependency

View File

@ -13,7 +13,7 @@ set (opm-porsol_DEPS
"CXX11Features" "CXX11Features"
# various runtime library enhancements # various runtime library enhancements
"Boost 1.39.0 "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 dependency
"dune-common REQUIRED; "dune-common REQUIRED;
dune-istl REQUIRED; dune-istl REQUIRED;

View File

@ -14,7 +14,7 @@ set (opm-upscaling_DEPS
"CXX11Features" "CXX11Features"
# various runtime library enhancements # various runtime library enhancements
"Boost 1.39.0 "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 # matrix library
"BLAS REQUIRED" "BLAS REQUIRED"
"LAPACK REQUIRED" "LAPACK REQUIRED"

View File

@ -13,7 +13,7 @@ set (opm-verteq_DEPS
"CXX11Features" "CXX11Features"
# various runtime library enhancements # various runtime library enhancements
"Boost 1.39.0 "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 dependency
"opm-core" "opm-core"
) )