Commit 5550234c authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

[opm] add patches for OPM 2017.10

parent 2b66ccbf
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/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
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment