OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #121 from jokva/opm-output-core-dependencies

Browse Source 
Swap opm-core/opm-output dependencies
This commit is contained in:
Joakim Hove
2016-06-10 13:15:11 +02:00
committed by GitHub
parent 340f860c52 e598210529
commit eee539e6f1
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/Modules/opm-core-prereqs.cmake
View File

@@ -42,4 +42,5 @@ set (opm-core_DEPS
"opm-parser REQUIRED" "opm-parser REQUIRED"
# the code which implements the material laws # the code which implements the material laws
"opm-material REQUIRED" "opm-material REQUIRED"
"opm-output REQUIRED"
) )

4
cmake/Modules/opm-output-prereqs.cmake
View File

@@ -14,13 +14,11 @@ set (opm-output_DEPS
"CXX11Features REQUIRED" "CXX11Features REQUIRED"
# various runtime library enhancements # various runtime library enhancements
"Boost 1.44.0 "Boost 1.44.0
COMPONENTS date_time filesystem system unit_test_framework REQUIRED" COMPONENTS filesystem system unit_test_framework REQUIRED"
# Ensembles-based Reservoir Tools (ERT) # Ensembles-based Reservoir Tools (ERT)
"ERT REQUIRED" "ERT REQUIRED"
# Look for MPI support # Look for MPI support
"opm-common REQUIRED" "opm-common REQUIRED"
# Parser library for ECL-type simulation models # Parser library for ECL-type simulation models
"opm-parser REQUIRED" "opm-parser REQUIRED"
# TODO remove this dependancy
"opm-core REQUIRED"
) )

2
travis/build-and-test.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -e set -e
build_order=(opm-common opm-parser opm-material opm-core opm-output opm-grid opm-simulators opm-upscaling) build_order=(opm-common opm-parser opm-material opm-output opm-core opm-grid opm-simulators opm-upscaling)
# This shell script should be started with the name of a module as # This shell script should be started with the name of a module as
# only only command line argument. It will start by building all # only only command line argument. It will start by building all