From f482e89e486e4d838f81bf5d87058b6a3df409f7 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/3] 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 58b627e30..b648b913e 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 1ce36d7c06030df144f5311bac908a062aaac19a 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/3] 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 b648b913e..8b3d45de1 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" ) From d4a7bcd8e4e54047574e806bf8c802540b59f620 Mon Sep 17 00:00:00 2001 From: Kristian Flikka Date: Tue, 11 Mar 2014 18:21:52 +0100 Subject: [PATCH 3/3] =?UTF-8?q?Only=20look=20for=20BOOST=C2=B4s=20unit=20t?= =?UTF-8?q?est=20framework=20module=20if=20not=20already=20found.=20Sync?= =?UTF-8?q?=20version=20with=20rest=20of=20system?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/Modules/UseDynamicBoost.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/Modules/UseDynamicBoost.cmake b/cmake/Modules/UseDynamicBoost.cmake index 590d23a12..dbfb937ce 100644 --- a/cmake/Modules/UseDynamicBoost.cmake +++ b/cmake/Modules/UseDynamicBoost.cmake @@ -1,5 +1,6 @@ -# be sure that this component is searched for -find_package (Boost COMPONENTS unit_test_framework QUIET) +if (NOT ${Boost_UNIT_TEST_FRAMEWORK_FOUND}) + find_package (Boost 1.44.0 COMPONENTS unit_test_framework QUIET) +endif () if (${Boost_UNIT_TEST_FRAMEWORK_FOUND}) # setup to do a test compile