* build-aux/build_unit_test.sh: Write Make variables with
parentheses instead of braces.
Add a space before `='.
---
ChangeLog | 8 ++++++++
build-aux/build_unit_test.sh | 14 +++++++-------
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 154b20b..b366f8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2013-09-11 Roland Levillain <roland(a)lrde.epita.fr>
+ Generate more uniform Makefile helpers for unit tests.
+
+ * build-aux/build_unit_test.sh: Write Make variables with
+ parentheses instead of braces.
+ Add a space before `='.
+
+2013-09-11 Roland Levillain <roland(a)lrde.epita.fr>
+
* build-aux/build_unit_test.sh: Properly handle QT_LIBS.
2013-09-09 Roland Levillain <roland(a)lrde.epita.fr>
diff --git a/build-aux/build_unit_test.sh b/build-aux/build_unit_test.sh
index 7f4748f..7b06879 100755
--- a/build-aux/build_unit_test.sh
+++ b/build-aux/build_unit_test.sh
@@ -112,20 +112,20 @@ EOF
# Write specific flags if there are dependencies.
if ! (test -z "$IFDEF"); then
- cppflags="${NAME}_CPPFLAGS="
- ldflags="${NAME}_LDFLAGS="
+ cppflags="${NAME}_CPPFLAGS ="
+ ldflags="${NAME}_LDFLAGS ="
for i in $IFDEF; do
- cppflags="${cppflags} \${${i}_CPPFLAGS} -DHAVE_${i}"
- ldflags="${ldflags} \${${i}_LDFLAGS} "
+ cppflags="${cppflags} \$(${i}_CPPFLAGS) -DHAVE_${i}"
+ ldflags="${ldflags} \$(${i}_LDFLAGS)"
done
- echo "$cppflags \${AM_CPPFLAGS}" >>"$output"
- echo "$ldflags \${AM_LDFLAGS}" >>"$output"
+ echo "$cppflags \$(AM_CPPFLAGS)" >>"$output"
+ echo "$ldflags \$(AM_LDFLAGS)" >>"$output"
# Local hack: Handle the special case of Qt, which defines
# QT_LIBS, to be use for with ${NAME}_LDADD variables.
for i in $IFDEF; do
if test "x$i" = xQT; then
- echo "${NAME}_LDADD= \${QT_LIBS} \${LDADD}" >>"$output"
+ echo "${NAME}_LDADD = \$(QT_LIBS) \$(LDADD)" >>"$output"
fi
done
fi
--
1.7.10.4
---
ChangeLog | 4 ++++
build-aux/build_unit_test.sh | 10 +++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index ba84a7b..154b20b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-11 Roland Levillain <roland(a)lrde.epita.fr>
+
+ * build-aux/build_unit_test.sh: Properly handle QT_LIBS.
+
2013-09-09 Roland Levillain <roland(a)lrde.epita.fr>
Olena: Remove Milena's build dir from the file inclusion path.
diff --git a/build-aux/build_unit_test.sh b/build-aux/build_unit_test.sh
index 6623c01..7f4748f 100755
--- a/build-aux/build_unit_test.sh
+++ b/build-aux/build_unit_test.sh
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory
+# Copyright (C) 2009, 2010, 2013 EPITA Research and Development Laboratory
# (LRDE)
#
# This file is part of Olena.
@@ -120,6 +120,14 @@ EOF
done
echo "$cppflags \${AM_CPPFLAGS}" >>"$output"
echo "$ldflags \${AM_LDFLAGS}" >>"$output"
+
+ # Local hack: Handle the special case of Qt, which defines
+ # QT_LIBS, to be use for with ${NAME}_LDADD variables.
+ for i in $IFDEF; do
+ if test "x$i" = xQT; then
+ echo "${NAME}_LDADD= \${QT_LIBS} \${LDADD}" >>"$output"
+ fi
+ done
fi
done
--
1.7.10.4
#282: Improve the support of FFTW
-------------------------+------------------------
Reporter: levill_r | Owner: Olena Team
Type: enhancement | Status: new
Priority: minor | Milestone: Olena 2.2
Component: Milena | Version: 2.0
Keywords: |
-------------------------+------------------------
Our support of the Fast Fourier Transform (trough FFTW) is rudimentary.
We should
* provide more services, i.e. support more data types and offer a better
coverage of the FFTW API;
* minimize I/Os by providing Milena image types wrapping raw FFTW data.
--
Ticket URL: <https://trac.lrde.epita.fr/olena/ticket/282>
Olena <http://olena.lrde.epita.fr>
Olena, a generic and efficient image processing platform
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Olena, a generic and efficient image processing platform".
The branch version.hh has been updated
discards 2a2dbc6c5881dab17ccee633d5391fa20538f8ee (commit)
discards 6cc134760d8b349dd07656af7f72c88ebe3629ee (commit)
via 8699ea5d37befe5372b398283d60cc96bf5f289d (commit)
via e61d93d250fd875e8b378e93ef55b2d2c504d9f7 (commit)
via 9c2f117f480691cd5ca4b496fd12b33471924d75 (commit)
via 9d5b6b6cd73db02b4917b059ba8152f3a0a434ad (commit)
via c9517b9272f27be5500296a6dc4e4622caf109f9 (commit)
via b8bc67ae64aa16d0de4b3b99c9e008d54770507c (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (2a2dbc6c5881dab17ccee633d5391fa20538f8ee)
\
N -- N -- N (8699ea5d37befe5372b398283d60cc96bf5f289d)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
8699ea5 Swilena: Remove Milena's build dir from the file inclusion path.
e61d93d Scribo: Do not look for headers in the build tree uselessly.
9c2f117 Milena: Do not look for headers in the build tree uselessly.
9d5b6b6 Olena: Remove Milena's build dir from the file inclusion path.
c9517b9 Force make to regen Milena's mln/version.hh before other files.
b8bc67a Have `make regen' also regenerate Milena's mln/version.hh.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 +++++
doc/Makefile.am | 5 ++--
milena/ChangeLog | 21 ++++++++++++++++-
milena/apps/constrained-connectivity/Makefile.am | 7 ++++--
milena/apps/generic-skel/Makefile.am | 4 ++--
milena/apps/graph-morpho/Makefile.am | 7 ++++--
milena/apps/mesh-segm-skel/Makefile.am | 4 +++-
milena/apps/morphers/Makefile.am | 4 +++-
milena/apps/papers/levillain.09.ismm/Makefile.am | 6 +++--
milena/doc/Makefile.am | 7 +++---
milena/tests/tests.mk | 9 +++----
milena/tools/tools.mk | 14 ++---------
scribo/ChangeLog | 26 +++++++++++++++++++++
scribo/doc/Makefile.am | 5 ++--
scribo/src/Makefile.am | 6 ++---
scribo/src/contest/DAE-2011/Makefile.am | 6 ++---
scribo/src/contest/hbr-2013/Makefile.am | 3 +--
scribo/src/contest/hdlac-2011/Makefile.am | 3 +--
scribo/src/contest/hnla-2013/Makefile.am | 3 +--
scribo/src/pbm_text_in_doc.cc | 6 +----
scribo/src/text/Makefile.am | 8 +++----
scribo/src/text/pbm_lines_recognition.cc | 6 +----
scribo/src/text/pbm_recognition.cc | 6 +----
scribo/src/text_recognition_in_picture.cc | 4 ----
scribo/src/toolchain/nepomuk/Makefile.am | 3 +--
scribo/src/toolchain/nepomuk/text_extraction.cc | 6 +----
scribo/tests/toolchain/nepomuk/Makefile.am | 3 +--
scribo/tests/toolchain/nepomuk/text_extraction.cc | 6 +----
swilena/ChangeLog | 6 +++++
swilena/python/Makefile.am | 2 +-
30 files changed, 113 insertions(+), 89 deletions(-)
hooks/post-receive
--
Olena, a generic and efficient image processing platform