From 09da53e10bde05355bddb5071d9f0eff56028d76 Mon Sep 17 00:00:00 2001
From: Markus Blatt <mblatt@dune-project.org>
Date: Wed, 16 May 2012 15:46:37 +0000
Subject: [PATCH] Package configuration files and find_package use the regular
dune modul name (lower case with dashes).
These leads to kind of weired variabable names (dune-common_DIR,
dune-common_LIBRARIES, etc.) but finds non-installes modules
easier. You just sets CMAKE_PREFIX_PATH to the directory containing
the modules.
[[Imported from SVN: r1584]]
---
DuneIstlConfig.cmake.in | 13 -------------
cmake/pkg/DuneIstlConfig.cmake.in | 14 --------------
cmake/pkg/dune-istl-config.cmake.in | 14 ++++++++++++++
dune-istl-config.cmake.in | 13 +++++++++++++
...lVersion.cmake.in => dune-istl-version.cmake.in | 0
5 files changed, 27 insertions(+), 27 deletions(-)
delete mode 100644 DuneIstlConfig.cmake.in
delete mode 100644 cmake/pkg/DuneIstlConfig.cmake.in
create mode 100644 cmake/pkg/dune-istl-config.cmake.in
create mode 100644 dune-istl-config.cmake.in
rename DuneIstlVersion.cmake.in => dune-istl-version.cmake.in (100%)
diff --git a/DuneIstlConfig.cmake.in b/DuneIstlConfig.cmake.in
deleted file mode 100644
index 85c6c5e39..000000000
--- a/DuneIstlConfig.cmake.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#import the target
-#include("@CMAKE_BINARY_DIR@/@DUNE_MOD_NAME_CMAKE@Targets.cmake")
-
-#report other information
-set(@DUNE_MOD_NAME_CMAKE@_PREFIX "@CMAKE_SOURCE_DIR@")
-set(@DUNE_MOD_NAME_CMAKE@_INCLUDE_DIRS "@CMAKE_SOURCE_DIR@")
-set(@DUNE_MOD_NAME_CMAKE@_CXX_FLAGS "@CMAKE_CXX_FLAGS@")
-set(@DUNE_MOD_NAME_CMAKE@_CXX_FLAGS_DEBUG "@CMAKE_CXX_FLAGS_DEBUG@")
-set(@DUNE_MOD_NAME_CMAKE@_CXX_FLAGS_MINSIZEREL "@CMAKE_CXX_FLAGS_MINSIZEREL@")
-set(@DUNE_MOD_NAME_CMAKE@_CXX_FLAGS_RELEASE "@CMAKE_CXX_FLAGS_RELEASE@")
-set(@DUNE_MOD_NAME_CMAKE@_CXX_FLAGS_RELWITHDEBINFO "@CMAKE_CXX_FLAGS_RELWITHDEBINFO@")
-set(@DUNE_MOD_NAME_CMAKE@_LIBRARIES "")
diff --git a/cmake/pkg/DuneIstlConfig.cmake.in b/cmake/pkg/DuneIstlConfig.cmake.in
deleted file mode 100644
index dced58abb..000000000
--- a/cmake/pkg/DuneIstlConfig.cmake.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#compute installation prefix relative to this file
-get_filename_component(_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
-get_filename_component(_prefix "${_dir}/../.." ABSOLUTE)
-
-#import the target
-#include("${_prefix}/lib/cmake/@DUNE_MOD_NAME_CMAKE@Targets.cmake")
-
-#report other information
-set(@DUNE_MOD_NAME_CMAKE@_INCLUDE_DIRS "${_prefix}/include")
-set(@DUNE_MOD_NAME_CMAKE@_CXX_FLAGS "@CMAKE_CXX_FLAGS@")
-set(@DUNE_MOD_NAME_CMAKE@_CXX_FLAGS_DEBUG "@CMAKE_CXX_FLAGS_DEBUG@")
-set(@DUNE_MOD_NAME_CMAKE@_CXX_FLAGS_MINSIZEREL "@CMAKE_CXX_FLAGS_MINSIZEREL@")
-set(@DUNE_MOD_NAME_CMAKE@_CXX_FLAGS_RELEASE "@CMAKE_CXX_FLAGS_RELEASE@")
-set(@DUNE_MOD_NAME_CMAKE@_CXX_FLAGS_RELWITHDEBINFO "@CMAKE_CXX_FLAGS_RELWITHDEBINFO@")
diff --git a/cmake/pkg/dune-istl-config.cmake.in b/cmake/pkg/dune-istl-config.cmake.in
new file mode 100644
index 000000000..2ee797b8f
--- /dev/null
+++ b/cmake/pkg/dune-istl-config.cmake.in
@@ -0,0 +1,14 @@
+#compute installation prefix relative to this file
+get_filename_component(_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_prefix "${_dir}/../.." ABSOLUTE)
+
+#import the target
+#include("${_prefix}/lib/cmake/@DUNE_MOD_NAME@-targets.cmake")
+
+#report other information
+set(@DUNE_MOD_NAME@_INCLUDE_DIRS "${_prefix}/include")
+set(@DUNE_MOD_NAME@_CXX_FLAGS "@CMAKE_CXX_FLAGS@")
+set(@DUNE_MOD_NAME@_CXX_FLAGS_DEBUG "@CMAKE_CXX_FLAGS_DEBUG@")
+set(@DUNE_MOD_NAME@_CXX_FLAGS_MINSIZEREL "@CMAKE_CXX_FLAGS_MINSIZEREL@")
+set(@DUNE_MOD_NAME@_CXX_FLAGS_RELEASE "@CMAKE_CXX_FLAGS_RELEASE@")
+set(@DUNE_MOD_NAME@_CXX_FLAGS_RELWITHDEBINFO "@CMAKE_CXX_FLAGS_RELWITHDEBINFO@")
diff --git a/dune-istl-config.cmake.in b/dune-istl-config.cmake.in
new file mode 100644
index 000000000..9e06a2ca1
--- /dev/null
+++ b/dune-istl-config.cmake.in
@@ -0,0 +1,13 @@
+
+#import the target
+#include("@CMAKE_BINARY_DIR@/@DUNE_MOD_NAME@-targets.cmake")
+
+#report other information
+set(@DUNE_MOD_NAME@_PREFIX "@CMAKE_SOURCE_DIR@")
+set(@DUNE_MOD_NAME@_INCLUDE_DIRS "@CMAKE_SOURCE_DIR@")
+set(@DUNE_MOD_NAME@_CXX_FLAGS "@CMAKE_CXX_FLAGS@")
+set(@DUNE_MOD_NAME@_CXX_FLAGS_DEBUG "@CMAKE_CXX_FLAGS_DEBUG@")
+set(@DUNE_MOD_NAME@_CXX_FLAGS_MINSIZEREL "@CMAKE_CXX_FLAGS_MINSIZEREL@")
+set(@DUNE_MOD_NAME@_CXX_FLAGS_RELEASE "@CMAKE_CXX_FLAGS_RELEASE@")
+set(@DUNE_MOD_NAME@_CXX_FLAGS_RELWITHDEBINFO "@CMAKE_CXX_FLAGS_RELWITHDEBINFO@")
+set(@DUNE_MOD_NAME@_LIBRARIES "")
diff --git a/DuneIstlVersion.cmake.in b/dune-istl-version.cmake.in
similarity index 100%
rename from DuneIstlVersion.cmake.in
rename to dune-istl-version.cmake.in
--
GitLab