From 2c9083c90e923848eee7a79d75aa6eb4722243d1 Mon Sep 17 00:00:00 2001 From: Markus Blatt <mblatt@dune-project.org> Date: Mon, 29 Apr 2013 13:52:54 +0000 Subject: [PATCH] translate further options. [[Imported from SVN: r7457]] --- lib/dunecommonam2cmake.lib | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/lib/dunecommonam2cmake.lib b/lib/dunecommonam2cmake.lib index e0b30ae23..a8415782b 100644 --- a/lib/dunecommonam2cmake.lib +++ b/lib/dunecommonam2cmake.lib @@ -7,15 +7,16 @@ ### ########################################## -# CMake Packages are case sensitive -# This is a list of packages whose names converted -# to lower case are used for configures -# --with-<package> or without-<package> options -# -CMAKE_PACKAGES="Boost Inkscape GMP LAPACK" dune_common_options_am2cmake() { + # CMake Packages are case sensitive + # This is a list of packages whose names converted + # to lower case are used for configures + # --with-<package> or without-<package> options + # + CMAKE_PACKAGES="Boost Inkscape GMP LAPACK" + default_am2cmake_options $CMAKE_PACKAGES # Check for --enable-parallel and otherwise deactivate MPI @@ -23,4 +24,21 @@ dune_common_options_am2cmake() if test "$?" -eq 0 ; then CMAKE_PARAMS="$CMAKE_PARAMS -DCMAKE_DISABLE_FIND_PACKAGE_MPI=TRUE" fi + # Check for --disable-gxx0xcheck + echo $PARAMS | grep \\-\\-disable-gxx0xcheck + if test "$?" -eq 0 ; then + CMAKE_PARAMS="$CMAKE_PARAMS -DDISABLE_GXX0XCHECK:Bool=TRUE" + fi + + # Check for --disable-gxx0xcheck + echo $PARAMS | grep \\-\\-disable-tr1-headers + if test "$?" -eq 0 ; then + CMAKE_PARAMS="$CMAKE_PARAMS -DDISABLE_TR1_HEADERS:Bool=TRUE" + fi + + # Check for --with-minimal-debug-level + local arg=`echo $PARAMS| sed "s/.*--with-minimal-debug-level=\(\S*\).*/\1/"` + if test "x$arg" != "x$PARAMS"; then + CMAKE_PARAMS="$CMAKE_PARAMS -DMINIMAL_DEBUG_LEVEL:String=$arg" + fi } -- GitLab