Rename macro modules
Modules that starts with the prefix "Use" alters the build to enable something by default, whereas modules that only provide functionality is not common to start with that prefix.
This commit is contained in:
parent
88d635524c
commit
0deeef0127
@ -19,7 +19,7 @@ set (opm-core_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}")
|
|||||||
list (APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/Modules")
|
list (APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/Modules")
|
||||||
|
|
||||||
# macro to set standard variables (INCLUDE_DIRS, LIBRARIES etc.)
|
# macro to set standard variables (INCLUDE_DIRS, LIBRARIES etc.)
|
||||||
include (UseOpmFind)
|
include (OpmFind)
|
||||||
|
|
||||||
# compile with C++0x/11 support if available
|
# compile with C++0x/11 support if available
|
||||||
find_package (CXX11Features REQUIRED)
|
find_package (CXX11Features REQUIRED)
|
||||||
@ -76,7 +76,7 @@ set (HAVE_ERT)
|
|||||||
|
|
||||||
# create configuration header which describes available features
|
# create configuration header which describes available features
|
||||||
# necessary to compile this library
|
# necessary to compile this library
|
||||||
include (UseConfigVars)
|
include (ConfigVars)
|
||||||
list (APPEND opm-core_CONFIG_VARS
|
list (APPEND opm-core_CONFIG_VARS
|
||||||
"HAVE_AGMG"
|
"HAVE_AGMG"
|
||||||
"HAVE_DUNE_ISTL"
|
"HAVE_DUNE_ISTL"
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
# Copyright (C) 2012 Uni Research AS
|
# Copyright (C) 2012 Uni Research AS
|
||||||
# This code is licensed under The GNU General Public License v3.0
|
# This code is licensed under The GNU General Public License v3.0
|
||||||
|
|
||||||
include (UseOpmPackage)
|
include (OpmPackage)
|
||||||
find_opm_package (
|
find_opm_package (
|
||||||
# module name
|
# module name
|
||||||
"dune-common"
|
"dune-common"
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
# Copyright (C) 2012 Uni Research AS
|
# Copyright (C) 2012 Uni Research AS
|
||||||
# This code is licensed under The GNU General Public License v3.0
|
# This code is licensed under The GNU General Public License v3.0
|
||||||
|
|
||||||
include (UseOpmPackage)
|
include (OpmPackage)
|
||||||
find_opm_package (
|
find_opm_package (
|
||||||
# module name
|
# module name
|
||||||
"dune-istl"
|
"dune-istl"
|
||||||
|
@ -11,14 +11,14 @@
|
|||||||
# This code is licensed under The GNU General Public License v3.0
|
# This code is licensed under The GNU General Public License v3.0
|
||||||
|
|
||||||
# these packages must be found specially, since they require arguments
|
# these packages must be found specially, since they require arguments
|
||||||
include (UseOpmFind)
|
include (OpmFind)
|
||||||
find_and_append_package_to (opm-core SuiteSparse COMPONENTS umfpack)
|
find_and_append_package_to (opm-core SuiteSparse COMPONENTS umfpack)
|
||||||
find_and_append_package_to (opm-core Boost 1.39.0
|
find_and_append_package_to (opm-core Boost 1.39.0
|
||||||
COMPONENTS date_time filesystem system unit_test_framework REQUIRED)
|
COMPONENTS date_time filesystem system unit_test_framework REQUIRED)
|
||||||
include (UseDynamicBoost)
|
include (UseDynamicBoost)
|
||||||
|
|
||||||
# use the generic find routine to handle the rest
|
# use the generic find routine to handle the rest
|
||||||
include (UseOpmPackage)
|
include (OpmPackage)
|
||||||
find_opm_package (
|
find_opm_package (
|
||||||
# module name
|
# module name
|
||||||
"opm-core"
|
"opm-core"
|
||||||
|
Loading…
Reference in New Issue
Block a user