diff --git a/.travis.yml b/.travis.yml index 52d8a299d..c9940106c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,15 +33,15 @@ matrix: install: - pushd .. - git clone https://github.com/Statoil/libecl.git - - git clone https://github.com/OPM/opm-parser.git + - git clone https://github.com/OPM/opm-common.git - mkdir libecl/build - pushd libecl/build - cmake -DENABLE_PYTHON=OFF -DBUILD_TESTS=OFF -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT .. - make install - popd - - mkdir opm-parser/build - - pushd opm-parser/build - - git checkout 2018.01 + - mkdir opm-common/build + - pushd opm-common/build + - git checkout release/sunbeam/2018.07 - cmake .. -DCMAKE_PREFIX_PATH=$INSTALL_ROOT -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT -DBUILD_TESTING=OFF diff --git a/CMakeLists.txt b/CMakeLists.txt index d2fc40390..c2611b68a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ enable_language( CXX ) include( CheckCXXSourceCompiles ) include( CTest ) -find_package(opm-parser REQUIRED) +find_package(opm-common REQUIRED) find_package(PythonInterp REQUIRED) set( warnings "-Wall -Wextra -pedantic -Wpointer-arith" ) diff --git a/sunbeam/CMakeLists.txt b/sunbeam/CMakeLists.txt index e99174521..aec907d5b 100644 --- a/sunbeam/CMakeLists.txt +++ b/sunbeam/CMakeLists.txt @@ -15,5 +15,7 @@ pybind11_add_module(libsunbeam sunbeam.cpp parser.cpp) set_target_properties( libsunbeam PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/python/sunbeam ) -target_link_libraries( libsunbeam PRIVATE ${opm-parser_LIBRARIES} ) +include_directories( ${opm-common_INCLUDE_DIRS} ) +message(${opm-common_LIBRARIES}) +target_link_libraries( libsunbeam PRIVATE ${opm-common_LIBRARIES} ) install(TARGETS libsunbeam DESTINATION ${PYTHON_INSTALL_PREFIX}/sunbeam)