restore dunecontrol compatibility after the opm-cmake -> opm-common rename

This commit is contained in:
Andreas Lauser
2015-09-08 11:56:28 +02:00
parent 28ab615b06
commit f46189ee1e

View File

@@ -16,36 +16,36 @@
cmake_minimum_required (VERSION 2.8) 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) 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) find_package(opm-common QUIET)
endif() endif()
if (opm-common_FOUND) if (opm-common_FOUND)
include(OpmInit) include(OpmInit)
else() else()
if (NOT OPM_CMAKE_ROOT AND SIBLING_SEARCH) if (NOT OPM_COMMON_ROOT AND SIBLING_SEARCH)
set(OPM_CMAKE_ROOT ${PROJECT_SOURCE_DIR}/../opm-common) set(OPM_COMMON_ROOT ${PROJECT_SOURCE_DIR}/../opm-common)
endif() endif()
if (OPM_CMAKE_ROOT) if (OPM_COMMON_ROOT)
list( APPEND CMAKE_MODULE_PATH "${OPM_CMAKE_ROOT}/cmake/Modules") list( APPEND CMAKE_MODULE_PATH "${OPM_COMMON_ROOT}/cmake/Modules")
include (OpmInit OPTIONAL RESULT_VARIABLE OPM_INIT) include (OpmInit OPTIONAL RESULT_VARIABLE OPM_INIT)
set( OPM_MACROS_ROOT ${OPM_CMAKE_ROOT} ) set( OPM_MACROS_ROOT ${OPM_COMMON_ROOT} )
endif() endif()
if (NOT OPM_INIT) if (NOT OPM_INIT)
message( "" ) message( "" )
message( " /-------------------------------------------------------------------------------\\") message( " /---------------------------------------------------------------------------------\\")
message( " | Could not locate the opm build macros. The opm build macros |") message( " | Could not locate the opm build macros. The opm build macros |")
message( " | are in a separate repository - instructions to proceed: |") message( " | are in a separate repository - instructions to proceed: |")
message( " | |") message( " | |")
message( " | 1. Clone the repository: git clone git@github.com:OPM/opm-common.git |") message( " | 1. Clone the repository: git clone git@github.com:OPM/opm-common.git |")
message( " | |") message( " | |")
message( " | 2. Run cmake in the current project with -DOPM_CMAKE_ROOT=<path>/opm-common|") message( " | 2. Run cmake in the current project with -DOPM_COMMON_ROOT=<path>/opm-common |")
message( " | |") message( " | |")
message( " \\-------------------------------------------------------------------------------/") message( " \\---------------------------------------------------------------------------------/")
message( "" ) message( "" )
message( FATAL_ERROR "Could not find OPM Macros") message( FATAL_ERROR "Could not find OPM Macros")
endif() endif()