diff --git a/patches/opm-common-2017.10.patch b/patches/opm-common-2017.10.patch new file mode 100644 index 0000000000000000000000000000000000000000..0fc80ce2fb1630cf0b915e29159260a06e3b895b --- /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 0000000000000000000000000000000000000000..77f691d9b2ea9bb01562de931c3042e9f7f09f71 --- /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