From 16896d1d6e61dabf164cd88a9ea185862584e97d Mon Sep 17 00:00:00 2001
From: Markus Blatt <mblatt@dune-project.org>
Date: Mon, 29 Apr 2013 13:52:25 +0000
Subject: [PATCH] Added function to convert the library options. Use local
variable for less interference.
[[Imported from SVN: r7456]]
---
lib/dunemodules.lib | 43 ++++++++++++++++++++++++++++++++++---------
1 file changed, 34 insertions(+), 9 deletions(-)
diff --git a/lib/dunemodules.lib b/lib/dunemodules.lib
index 2039fe988..b69229ba7 100644
--- a/lib/dunemodules.lib
+++ b/lib/dunemodules.lib
@@ -585,9 +585,9 @@ check_version() {
# the <CMAKE_PACKAGE_ALL_UPPERCASE>_ROOT variable
default_am2cmake_options(){
while test "$#" -gt 0; do
- package=$1
- lowercase=${1,,}
- uppercase=${1^^}
+ local package=$1
+ local lowercase=${1,,}
+ local uppercase=${1^^}
shift
if eval test \$"$lowercase"_processed ; then
continue
@@ -600,7 +600,8 @@ default_am2cmake_options(){
continue
fi
# process --with-$lowercase=<arg>
- arg=`echo $PARAMS| sed "s/.*--with-$lowercase=\(\S*\).*/\1/"`
+ local arg=`echo $PARAMS| sed "s/.*--with-$lowercase=\(\S*\).*/\1/"`
+ local arg=`eval echo $arg` # expand tilde to prevent problems
if test "x$arg" = "xno"; then
CMAKE_PARAMS="$CMAKE_PARAMS -DCMAKE_DISABLE_FIND_PACKAGE_$package=TRUE"
continue
@@ -612,18 +613,42 @@ default_am2cmake_options(){
export CMAKE_PARAMS
}
+
+# Default translation routine for libraries.
+# Arguments are the CMake package names.
+# Searches for --with-<package>lib=<library>
+# in the configure options and translates them
+# to -D<PACKAGE>_LIBRARY=<library>
+default_am2cmake_libraries(){
+ while test "$#" -gt 0; do
+ lib=$1
+ lowercase=${1,,}
+ uppercase=${1^^}
+ shift
+ if eval test \$"$lowercase"-lib_processed; then
+ continue
+ fi
+ export "$lowercase"-lib_processed=1
+ term="s/.*--with-""$lowercase""-lib=\(\S*\).*/\1/"
+ arg=`echo $PARAMS | sed "$term"`
+ if test "x$arg" != "x" && test "x$PARAMS" != "x$arg"; then
+ CMAKE_PARAMS="$CMAKE_PARAMS -D$uppercase""_LIBRARY=$arg"
+ fi
+ done
+}
+
module_translate_options_am2cmake()
{
- module=$1 # the module name
- path=$2 # where the sh libs reside
+ local module=$1 # the module name
+ local path=$2 # where the sh libs reside
# Check whether the module provides a lib named
# <module-without-dashes>autotools2cmake.lib
- module_undashed=`echo $module | sed "s/[-_]//g"`
- libfile="$path/$module_undashed""am2cmake.lib"
+ local module_undashed=`echo $module | sed "s/[-_]//g"`
+ local libfile="$path/$module_undashed""am2cmake.lib"
if test -e "$libfile"; then
. $libfile
- module_underline=`echo $module | sed "s/-/_/g"`
+ local module_underline=`echo $module | sed "s/-/_/g"`
eval "$module_underline"_options_am2cmake
else
echo "$libfile for converting options does not exist"
--
GitLab