From 8fb0013b097ea560664509fc1f8090eea5a75b85 Mon Sep 17 00:00:00 2001
From: Markus Blatt <mblatt@dune-project.org>
Date: Mon, 20 Aug 2012 15:02:24 +0000
Subject: [PATCH] Allow passing additonal CMake flags.
[[Imported from SVN: r6909]]
---
bin/dunecontrol | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/bin/dunecontrol b/bin/dunecontrol
index 8715493fe..777b518b2 100755
--- a/bin/dunecontrol
+++ b/bin/dunecontrol
@@ -166,6 +166,7 @@ load_opts() {
BUILDDIR=$DUNE_BUILDDIR
if test "x$DUNE_OPTS_FILE" != "x"; then
BUILDDIR="$(eval BUILDDIR=""; . $DUNE_OPTS_FILE; eval echo \$BUILDDIR)"
+ CMAKE_FLAGS="$(. $DUNE_OPTS_FILE; eval echo \$CMAKE_FLAGS)"
CMD_FLAGS_FROM_FILE="$(eval ${COMMAND}_FLAGS=""; . $DUNE_OPTS_FILE; eval echo \$${COMMAND}_FLAGS)"
fi
if test -n "$CMD_FLAGS_FROM_FILE"; then
@@ -426,8 +427,8 @@ run_default_configure () {
SRCDIR="$PWD"
cd "$BUILDDIR"
echo `pwd`
- echo "cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_MODULE_PATH=$CMAKE_MODULE_PATH $CMAKE_PARAMS $SRCDIR"
- eval cmake "-DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_MODULE_PATH=$CMAKE_MODULE_PATH $CMAKE_PARAMS $SRCDIR"
+ echo "cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_MODULE_PATH=$CMAKE_MODULE_PATH $CMAKE_PARAMS $CMAKE_FLAGS $SRCDIR"
+ eval cmake "-DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_MODULE_PATH=$CMAKE_MODULE_PATH $CMAKE_PARAMS $CMAKE_FLAGS $SRCDIR"
else
echo ./configure "$PARAMS"
# create build directory of requested
--
GitLab