From b6b118d18a5a73852cc0207b9830317bda699cdc Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Mon, 11 Dec 2017 12:52:54 +0100
Subject: [PATCH] [opm] add patches for OPM 2017.10
(cherry picked from commit 5550234c7a7ae3139c6fcfd52d7b1df9fc017940)
---
patches/opm-common-2017.10.patch | 15 +++++++++++++++
patches/opm-parser-2017.10.patch | 20 ++++++++++++++++++++
2 files changed, 35 insertions(+)
create mode 100644 patches/opm-common-2017.10.patch
create mode 100644 patches/opm-parser-2017.10.patch
diff --git a/patches/opm-common-2017.10.patch b/patches/opm-common-2017.10.patch
new file mode 100644
index 0000000000..0fc80ce2fb
--- /dev/null
+++ b/patches/opm-common-2017.10.patch
@@ -0,0 +1,15 @@
+diff --git a/cmake/Modules/Findopm-parser.cmake b/cmake/Modules/Findopm-parser.cmake
+index 42b5ae9..2977ee9 100644
+--- a/cmake/Modules/Findopm-parser.cmake
++++ b/cmake/Modules/Findopm-parser.cmake
+@@ -31,8 +31,8 @@ string(REGEX REPLACE "${PROJECT_SOURCE_DIR}/?(.*)" "\\1" BUILD_DIR_SUFFIX "${PR
+ # or in relative directories to this one
+ if (OPM_PARSER_ROOT)
+ set (_no_default_path "NO_DEFAULT_PATH")
+- set (_opm_parser_source "")
+- set (_opm_parser_build "")
++ set (_opm_parser_source "${OPM_PARSER_ROOT}")
++ set (_opm_parser_build "${OPM_PARSER_ROOT}/${BUILD_DIR_SUFFIX}")
+ else ()
+ set (_no_default_path "")
+ set (_opm_parser_source
diff --git a/patches/opm-parser-2017.10.patch b/patches/opm-parser-2017.10.patch
new file mode 100644
index 0000000000..77f691d9b2
--- /dev/null
+++ b/patches/opm-parser-2017.10.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d81c5dc2..964c19de 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -91,14 +91,7 @@ else ()
+ add_subdirectory(external/cjson)
+ endif()
+
+-# if building shared libraries, then don't include Boost in them
+-if (BUILD_SHARED_LIBS)
+- set(Boost_USE_STATIC_LIBS OFF)
+- set(Boost_USE_STATIC_RUNTIME OFF)
+-else ()
+-# if using dynamic boost, the header file must generate a main() function
+- set(Boost_USE_STATIC_LIBS ON)
+-endif ()
++add_definitions(-DBOOST_TEST_DYN_LINK)
+
+ find_package(Boost 1.44.0
+ COMPONENTS filesystem
--
GitLab