[Dune-devel] [Dune-Commit] [Commit] dune-common - 5439c28: Revert "[CMake] dunecontrol calls "cmake -build ." instead of make."
Christian Engwer
christian.engwer at uni-muenster.de
Tue Feb 24 17:11:20 CET 2015
Dear Markus,
as we are currently discussing a solution, I think it was a bit hasty
to revert the patch at such short notice. There are good reasons to
have the feature and according to Rene, my proposed solution does
work.
I'll have a look for a proper fix instead of just reverting.
Ciao
Christian
On Tue, Feb 24, 2015 at 12:21:29PM +0100, Markus Blatt wrote:
> New commit, appeared at Tue Feb 24 12:21:28 2015 +0100
> as part of the following ref changes:
>
> branch refs/heads/master updated from 5569666 -> 5439c28
>
> Browsable version: http://cgit.dune-project.org/repositories/dune-common/commit/?id=5439c28e5ca90677ad0765594307688816024860
>
> ======================================================================
>
> commit 5439c28e5ca90677ad0765594307688816024860
> Author: Markus Blatt <markus at dr-blatt.de>
> Date: Tue Feb 24 12:20:18 2015 +0100
>
> Revert "[CMake] dunecontrol calls "cmake -build ." instead of make."
>
> This reverts commit eb045a4d6b61ccc1a8d3378fcbd292ad9e8f668c.
>
> As it severly breaks using the make build system. See
> https://dune-project.org/flyspray/index.php?do=details&task_id=1572
>
> bin/dunecontrol | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>
>
> diff --git a/bin/dunecontrol b/bin/dunecontrol
> index f553d4c..51afd34 100755
> --- a/bin/dunecontrol
> +++ b/bin/dunecontrol
> @@ -752,8 +752,8 @@ run_default_make () {
> echo make "$PARAMS"
> eval $MAKE "$PARAMS"
> else
> - echo $CMAKE --build . "$PARAMS"
> - eval $CMAKE --build . "$PARAMS"
> + echo make "$PARAMS"
> + eval $MAKE "$PARAMS"
> fi
> }
>
>
> _______________________________________________
> Dune-Commit mailing list
> Dune-Commit at dune-project.org
> http://lists.dune-project.org/mailman/listinfo/dune-commit
>
--
Prof. Dr. Christian Engwer
Institut für Numerische und Angewandte Mathematik
Fachbereich Mathematik und Informatik der Universität Münster
Einsteinstrasse 62
48149 Münster
E-Mail christian.engwer at uni-muenster.de
Telefon +49 251 83-35067
FAX +49 251 83-32729
More information about the Dune-devel
mailing list