From 0deeef012732987c394be1036e79e6fa6ead1f6f Mon Sep 17 00:00:00 2001
From: Roland Kaufmann <roland.kaufmann@uni.no>
Date: Wed, 5 Dec 2012 09:34:38 +0100
Subject: [PATCH] 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.
---
 CMakeLists.txt                                          | 4 ++--
 cmake/Modules/{UseConfigVars.cmake => ConfigVars.cmake} | 0
 cmake/Modules/Finddune-common.cmake                     | 2 +-
 cmake/Modules/Finddune-istl.cmake                       | 2 +-
 cmake/Modules/Findopm-core.cmake                        | 4 ++--
 cmake/Modules/{UseOpmFind.cmake => OpmFind.cmake}       | 0
 cmake/Modules/{UseOpmPackage.cmake => OpmPackage.cmake} | 0
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename cmake/Modules/{UseConfigVars.cmake => ConfigVars.cmake} (100%)
 rename cmake/Modules/{UseOpmFind.cmake => OpmFind.cmake} (100%)
 rename cmake/Modules/{UseOpmPackage.cmake => OpmPackage.cmake} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b24988f1..ef0728fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ set (opm-core_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}")
 list (APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/Modules")
 
 # macro to set standard variables (INCLUDE_DIRS, LIBRARIES etc.)
-include (UseOpmFind)
+include (OpmFind)
 
 # compile with C++0x/11 support if available
 find_package (CXX11Features REQUIRED)
@@ -76,7 +76,7 @@ set (HAVE_ERT)
 
 # create configuration header which describes available features
 # necessary to compile this library
-include (UseConfigVars)
+include (ConfigVars)
 list (APPEND opm-core_CONFIG_VARS
 	"HAVE_AGMG"
 	"HAVE_DUNE_ISTL"
diff --git a/cmake/Modules/UseConfigVars.cmake b/cmake/Modules/ConfigVars.cmake
similarity index 100%
rename from cmake/Modules/UseConfigVars.cmake
rename to cmake/Modules/ConfigVars.cmake
diff --git a/cmake/Modules/Finddune-common.cmake b/cmake/Modules/Finddune-common.cmake
index b12dd870..093d7dff 100644
--- a/cmake/Modules/Finddune-common.cmake
+++ b/cmake/Modules/Finddune-common.cmake
@@ -10,7 +10,7 @@
 # Copyright (C) 2012 Uni Research AS
 # This code is licensed under The GNU General Public License v3.0
 
-include (UseOpmPackage)
+include (OpmPackage)
 find_opm_package (
   # module name
   "dune-common"
diff --git a/cmake/Modules/Finddune-istl.cmake b/cmake/Modules/Finddune-istl.cmake
index 690ac724..edf47ff0 100644
--- a/cmake/Modules/Finddune-istl.cmake
+++ b/cmake/Modules/Finddune-istl.cmake
@@ -10,7 +10,7 @@
 # Copyright (C) 2012 Uni Research AS
 # This code is licensed under The GNU General Public License v3.0
 
-include (UseOpmPackage)
+include (OpmPackage)
 find_opm_package (
   # module name
   "dune-istl"
diff --git a/cmake/Modules/Findopm-core.cmake b/cmake/Modules/Findopm-core.cmake
index eb4c2c7c..3ac493aa 100644
--- a/cmake/Modules/Findopm-core.cmake
+++ b/cmake/Modules/Findopm-core.cmake
@@ -11,14 +11,14 @@
 # This code is licensed under The GNU General Public License v3.0
 
 # 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 Boost 1.39.0
 	COMPONENTS date_time filesystem system unit_test_framework REQUIRED)
 include (UseDynamicBoost)
 
 # use the generic find routine to handle the rest
-include (UseOpmPackage)
+include (OpmPackage)
 find_opm_package (
   # module name
   "opm-core"
diff --git a/cmake/Modules/UseOpmFind.cmake b/cmake/Modules/OpmFind.cmake
similarity index 100%
rename from cmake/Modules/UseOpmFind.cmake
rename to cmake/Modules/OpmFind.cmake
diff --git a/cmake/Modules/UseOpmPackage.cmake b/cmake/Modules/OpmPackage.cmake
similarity index 100%
rename from cmake/Modules/UseOpmPackage.cmake
rename to cmake/Modules/OpmPackage.cmake