diff --git a/bin/dunecontrol b/bin/dunecontrol index 8715493fe5424b4864fbba33794d763a49cfa021..777b518b20a8bafb6ed23ecb526135741701a3a8 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