From f46189ee1e1df94c2c75c87435962c8c243a2070 Mon Sep 17 00:00:00 2001 From: Andreas Lauser Date: Tue, 8 Sep 2015 11:56:28 +0200 Subject: [PATCH] restore dunecontrol compatibility after the opm-cmake -> opm-common rename --- CMakeLists.txt | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b5f57490..281bb683e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,36 +16,36 @@ cmake_minimum_required (VERSION 2.8) -set( OPM_CMAKE_ROOT "" CACHE PATH "Root directory containing OPM related cmake modules") +set( OPM_COMMON_ROOT "" CACHE PATH "Root directory containing OPM related cmake modules") option(SIBLING_SEARCH "Search for other modules in sibling directories?" ON) -if(NOT OPM_CMAKE_ROOT) +if(NOT OPM_COMMON_ROOT) find_package(opm-common QUIET) endif() if (opm-common_FOUND) include(OpmInit) else() - if (NOT OPM_CMAKE_ROOT AND SIBLING_SEARCH) - set(OPM_CMAKE_ROOT ${PROJECT_SOURCE_DIR}/../opm-common) + if (NOT OPM_COMMON_ROOT AND SIBLING_SEARCH) + set(OPM_COMMON_ROOT ${PROJECT_SOURCE_DIR}/../opm-common) endif() - if (OPM_CMAKE_ROOT) - list( APPEND CMAKE_MODULE_PATH "${OPM_CMAKE_ROOT}/cmake/Modules") + if (OPM_COMMON_ROOT) + list( APPEND CMAKE_MODULE_PATH "${OPM_COMMON_ROOT}/cmake/Modules") include (OpmInit OPTIONAL RESULT_VARIABLE OPM_INIT) - set( OPM_MACROS_ROOT ${OPM_CMAKE_ROOT} ) + set( OPM_MACROS_ROOT ${OPM_COMMON_ROOT} ) endif() if (NOT OPM_INIT) message( "" ) - message( " /-------------------------------------------------------------------------------\\") - message( " | Could not locate the opm build macros. The opm build macros |") - message( " | are in a separate repository - instructions to proceed: |") - message( " | |") - message( " | 1. Clone the repository: git clone git@github.com:OPM/opm-common.git |") - message( " | |") - message( " | 2. Run cmake in the current project with -DOPM_CMAKE_ROOT=/opm-common|") - message( " | |") - message( " \\-------------------------------------------------------------------------------/") + message( " /---------------------------------------------------------------------------------\\") + message( " | Could not locate the opm build macros. The opm build macros |") + message( " | are in a separate repository - instructions to proceed: |") + message( " | |") + message( " | 1. Clone the repository: git clone git@github.com:OPM/opm-common.git |") + message( " | |") + message( " | 2. Run cmake in the current project with -DOPM_COMMON_ROOT=/opm-common |") + message( " | |") + message( " \\---------------------------------------------------------------------------------/") message( "" ) message( FATAL_ERROR "Could not find OPM Macros") endif()