Commit d7994b7d authored by Timo Koch's avatar Timo Koch

Merge branch 'fix/opm-common-package' into 'master'

[cmake] Delete find package opm-common

See merge request !1436

(cherry picked from commit 42a4f9a8)

879d0c69 [cmake] Delete find package opm-common
parent 9781301b
...@@ -12,18 +12,8 @@ if(NOT (dune-common_DIR ...@@ -12,18 +12,8 @@ if(NOT (dune-common_DIR
${PROJECT_BINARY_DIR}) ${PROJECT_BINARY_DIR})
endif() endif()
if(NOT (opm-common_DIR
OR opm-common_ROOT
OR "${CMAKE_PREFIX_PATH}" MATCHES ".*opm-common.*"))
string(REPLACE ${CMAKE_PROJECT_NAME}
opm-common opm-common_DIR
${PROJECT_BINARY_DIR})
endif()
#find dune-common and set the module path #find dune-common and set the module path
find_package(dune-common) find_package(dune-common)
#find opm-common to support OPM
find_package(opm-common)
list(APPEND CMAKE_MODULE_PATH ${dune-common_MODULE_PATH} list(APPEND CMAKE_MODULE_PATH ${dune-common_MODULE_PATH}
"${PROJECT_SOURCE_DIR}/cmake/modules") "${PROJECT_SOURCE_DIR}/cmake/modules")
......
Markdown is supported
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