mirror of
https://github.com/OPM/opm-simulators.git
synced 2024-12-25 08:41:00 -06:00
changed: sync with renaming to opm-common
This commit is contained in:
parent
89ae28d3c5
commit
28ab615b06
@ -20,14 +20,14 @@ set( OPM_CMAKE_ROOT "" CACHE PATH "Root directory containing OPM related cmake m
|
||||
option(SIBLING_SEARCH "Search for other modules in sibling directories?" ON)
|
||||
|
||||
if(NOT OPM_CMAKE_ROOT)
|
||||
find_package(opm-cmake QUIET)
|
||||
find_package(opm-common QUIET)
|
||||
endif()
|
||||
|
||||
if (opm-cmake_FOUND)
|
||||
if (opm-common_FOUND)
|
||||
include(OpmInit)
|
||||
else()
|
||||
if (NOT OPM_CMAKE_ROOT AND SIBLING_SEARCH)
|
||||
set(OPM_CMAKE_ROOT ${PROJECT_SOURCE_DIR}/../opm-cmake)
|
||||
set(OPM_CMAKE_ROOT ${PROJECT_SOURCE_DIR}/../opm-common)
|
||||
endif()
|
||||
if (OPM_CMAKE_ROOT)
|
||||
list( APPEND CMAKE_MODULE_PATH "${OPM_CMAKE_ROOT}/cmake/Modules")
|
||||
@ -41,9 +41,9 @@ else()
|
||||
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-cmake.git |")
|
||||
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=<path>/opm-cmake |")
|
||||
message( " | 2. Run cmake in the current project with -DOPM_CMAKE_ROOT=<path>/opm-common|")
|
||||
message( " | |")
|
||||
message( " \\-------------------------------------------------------------------------------/")
|
||||
message( "" )
|
||||
|
4
configure
vendored
4
configure
vendored
@ -6,7 +6,7 @@ src_dir=$(dirname $0)
|
||||
mod_dir=
|
||||
for OPT in "$@"; do
|
||||
case "$OPT" in
|
||||
--with-opm-cmake=*)
|
||||
--with-opm-common=*)
|
||||
# remove everything before equal sign and assign the rest
|
||||
mod_dir=${OPT#*=}
|
||||
# tilde expansion; note that doing eval may have side effects
|
||||
@ -27,7 +27,7 @@ fi
|
||||
|
||||
# terminate with error message here if the module directory is not found
|
||||
if [ ! -r "$mod_dir/$conf_file" ]; then
|
||||
echo Build macros not located in \"$mod_dir\", use --with-opm-cmake= to specify! 1>&2
|
||||
echo Build macros not located in \"$mod_dir\", use --with-opm-common= to specify! 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
@ -3,5 +3,5 @@ Description: Utilities for automatic differentiation and simulators based on AD
|
||||
Version: 0.9
|
||||
Label: 2013.10
|
||||
Maintainer: atgeirr@sintef.no
|
||||
Depends: opm-cmake opm-core dune-istl (>=2.2)
|
||||
Depends: opm-common opm-core dune-istl (>=2.2)
|
||||
Suggests: dune-cornerpoint
|
||||
|
Loading…
Reference in New Issue
Block a user