From c68667458efb892e6771ee5aed380305d0bf175b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= Date: Mon, 3 Mar 2014 15:05:53 +0100 Subject: [PATCH 1/2] Defer searching for opm-parser The "opm-parser" module is expected to become dependent upon the ERT library. Defer searching for the parser module until we've established whether or not ERT is availble. Suggested by: @andlaus --- cmake/Modules/opm-core-prereqs.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/Modules/opm-core-prereqs.cmake b/cmake/Modules/opm-core-prereqs.cmake index 58b627e3..b648b913 100644 --- a/cmake/Modules/opm-core-prereqs.cmake +++ b/cmake/Modules/opm-core-prereqs.cmake @@ -25,11 +25,11 @@ set (opm-core_DEPS "SuperLU" # xml processing (for config parsing) "TinyXML" - #Parser library - "opm-parser REQUIRED" # Ensembles-based Reservoir Tools (ERT) "ERT" # DUNE dependency "dune-common" "dune-istl" + #Parser library + "opm-parser REQUIRED" ) From 121c3911cb1eb664615ae43c65426cf9f826133a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= Date: Mon, 3 Mar 2014 15:44:16 +0100 Subject: [PATCH 2/2] Elucidate description string for opm-parser. The 'opm-parser' module is (currently) designed to parse ECL-type simulation models. Reflect that fact in its description. --- cmake/Modules/opm-core-prereqs.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Modules/opm-core-prereqs.cmake b/cmake/Modules/opm-core-prereqs.cmake index b648b913..8b3d45de 100644 --- a/cmake/Modules/opm-core-prereqs.cmake +++ b/cmake/Modules/opm-core-prereqs.cmake @@ -30,6 +30,6 @@ set (opm-core_DEPS # DUNE dependency "dune-common" "dune-istl" - #Parser library + # Parser library for ECL-type simulation models "opm-parser REQUIRED" )