From d7994b7d5796c1b9645d44e8e0a22d80d8716bc8 Mon Sep 17 00:00:00 2001 From: Timo Koch Date: Wed, 19 Dec 2018 12:53:08 +0000 Subject: [PATCH] Merge branch 'fix/opm-common-package' into 'master' [cmake] Delete find package opm-common See merge request dumux-repositories/dumux!1436 (cherry picked from commit 42a4f9a85abc8ea1f783d78fa9b2d6b2af686b65) 879d0c69 [cmake] Delete find package opm-common --- CMakeLists.txt | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bf9f156ac9..a6a2f8270a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") -- GitLab