Skip to content
Snippets Groups Projects
Commit e787bc52 authored by Timo Koch's avatar Timo Koch
Browse files

Merge branch 'cherry-pick-42a4f9a8' into 'releases/3.0'

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

See merge request !1438
parents 9781301b d7994b7d
1 merge request!1438Merge branch 'fix/opm-common-package' into 'master'
......@@ -12,18 +12,8 @@ if(NOT (dune-common_DIR
${PROJECT_BINARY_DIR})
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_package(dune-common)
#find opm-common to support OPM
find_package(opm-common)
list(APPEND CMAKE_MODULE_PATH ${dune-common_MODULE_PATH}
"${PROJECT_SOURCE_DIR}/cmake/modules")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment